[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.20-19-g61539ef

[by Daniel Kahn Gillmor]

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, STABLE-BRANCH-1-4 has been updated
       via  61539efc2bc4ba9a9faceaced12660d588c1be7a (commit)
      from  15d13272344fa0d8753a321c087b30a6d5115dfb (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 61539efc2bc4ba9a9faceaced12660d588c1be7a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Aug 5 10:46:43 2016 -0400

    gpg: Avoid publishing the GnuPG version by default
    
    * g10/gpg.c (main): initialize opt.emit_version to 0
    * doc/gpg.texi: document different default for --emit-version
    
    --
    
    The version of GnuPG in use is not particularly helpful.  It is not
    cryptographically verifiable, and it doesn't distinguish between
    significant version differences like 2.0.x and 2.1.x.
    
    Additionally, it leaks metadata that can be used to distinguish users
    from one another, and can potentially be used to target specific
    attacks if there are known behaviors that differ between major
    versions.
    
    It's probably better to take the more parsimonious approach to
    metadata production by default.
    
    (backport of master commit c9387e41db7520d176edd3d6613b85875bdeb32c)
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index a41ab8e..12a6d60 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2338,9 +2338,9 @@ protected by the signature.
 @opindex emit-version
 Force inclusion of the version string in ASCII armored output.  If
 given once only the name of the program and the major number is
-emitted (default), given twice the minor is also emitted, given triple
+emitted, given twice the minor is also emitted, given triple
 the micro is added, and given quad an operating system identification
-is also emitted.  @option{--no-emit-version} disables the version
+is also emitted.  @option{--no-emit-version} (default) disables the version
 line.
 
 @item --sig-notation @code{name=value}
diff --git a/g10/gpg.c b/g10/gpg.c
index 72d313b..236ea1e 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1911,7 +1911,7 @@ main (int argc, char **argv )
     opt.def_cert_expire="0";
     set_homedir ( default_homedir () );
     opt.passwd_repeat=1;
-    opt.emit_version = 1; /* Limit to the major number.  */
+    opt.emit_version = 0;
 
 #ifdef ENABLE_CARD_SUPPORT
 #if defined(_WIN32) || defined(__CYGWIN__)

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

Summary of changes:
 doc/gpg.texi | 4 ++--
 g10/gpg.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


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