[git] GnuPG - branch, master, updated. gnupg-2.1.2-65-g674e9a0

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  674e9a02aba85be769d780509313ef1080526027 (commit)
      from  1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 674e9a02aba85be769d780509313ef1080526027
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Mar 25 10:16:37 2015 +0100

    doc: Document the changed default algos for gpgsm.
    
    --

diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index dcfe292..9f16f82 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -622,7 +622,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
- at code{3DES} (1.2.840.113549.3.7).
+ at 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
@@ -1144,7 +1144,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
 

-----------------------------------------------------------------------

Summary of changes:
 doc/gpgsm.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org