aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-08-05 14:46:43 +0000
committerJustus Winter <[email protected]>2016-08-09 10:33:44 +0000
commit61539efc2bc4ba9a9faceaced12660d588c1be7a (patch)
tree7f27ad244cd7381d811313fd69a94e78d6a716ab
parentClean up "allow to" (diff)
downloadgnupg-61539efc2bc4ba9a9faceaced12660d588c1be7a.tar.gz
gnupg-61539efc2bc4ba9a9faceaced12660d588c1be7a.zip
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 <[email protected]>
-rw-r--r--doc/gpg.texi4
-rw-r--r--g10/gpg.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index a41ab8e0c..12a6d60d5 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 72d313b49..236ea1e66 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__)