aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-08-04 20:58:13 +0000
committerWerner Koch <[email protected]>2016-08-05 10:23:04 +0000
commitc9387e41db7520d176edd3d6613b85875bdeb32c (patch)
tree276a28bfbee23060b97471e92e4d7cd7e1601467
parentgpg: Make sure that keygrips are printed for each subkey. (diff)
downloadgnupg-c9387e41db7520d176edd3d6613b85875bdeb32c.tar.gz
gnupg-c9387e41db7520d176edd3d6613b85875bdeb32c.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. 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 c54496747..ffbc26955 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2713,9 +2713,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 35d350eb6..b33b61b7c 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2269,7 +2269,7 @@ main (int argc, char **argv)
opt.def_cert_expire = "0";
gnupg_set_homedir (NULL);
opt.passphrase_repeat = 1;
- opt.emit_version = 1; /* Limit to the major number. */
+ opt.emit_version = 0;
opt.weak_digests = NULL;
additional_weak_digest("MD5");