aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-03-25 09:16:37 +0000
committerWerner Koch <[email protected]>2015-03-25 09:26:26 +0000
commit2a2da1b165f0a3050bca51dea67db9c04b9cb734 (patch)
treeb0ce36cd3130e952ccc78c768e210bd2dd9654ce
parentsm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption). (diff)
downloadgnupg-2a2da1b165f0a3050bca51dea67db9c04b9cb734.tar.gz
gnupg-2a2da1b165f0a3050bca51dea67db9c04b9cb734.zip
doc: Document the changed default algos for gpgsm.
--
-rw-r--r--doc/gpgsm.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 078d2ad6a..b0882b8ba 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -609,7 +609,7 @@ certificates starting with the signer cert. The default is -2.
Use the cipher algorithm with the ASN.1 object identifier @var{oid} for
encryption. For convenience the strings @code{3DES}, @code{AES} and
@code{AES256} may be used instead of their OIDs. The default is
-@code{3DES} (1.2.840.113549.3.7).
+@code{AES} (2.16.840.1.101.3.4.1.2).
@item --digest-algo @code{name}
Use @code{name} as the message digest algorithm. Usually this
@@ -1127,7 +1127,7 @@ keygrip with a @samp{&}.
Use @var{hash-algo} for this CSR or certificate. The supported hash
algorithms are: @samp{sha1}, @samp{sha256}, @samp{sha384} and
@samp{sha512}; they may also be specified with uppercase letters. The
-default is @samp{sha1}.
+default is @samp{sha256}.
@end table