From 7257ea2d450238afa4d162fab8001f74782fe43f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 6 Jun 2016 17:03:47 +0200 Subject: [PATCH] gpg: Use --keyid-format=none by default. * g10/gpg.c (main): Init keyid_format to KF_NONE. * g10/keyid.c (format_keyid): Ditto. (keystrlen): Ditto. -- GnuPG-bug-id: 2379 Signed-off-by: Werner Koch --- g10/gpg.c | 2 +- g10/keyid.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/g10/gpg.c b/g10/gpg.c index 5b4fba611..df6c24699 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -2249,7 +2249,7 @@ main (int argc, char **argv) opt.mangle_dos_filenames = 0; opt.min_cert_level = 2; set_screen_dimensions (); - opt.keyid_format = KF_SHORT; + opt.keyid_format = KF_NONE; opt.def_sig_expire = "0"; opt.def_cert_expire = "0"; set_homedir (default_homedir ()); diff --git a/g10/keyid.c b/g10/keyid.c index 4cdc41d2a..e67f67f65 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -333,7 +333,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len) if (format == KF_DEFAULT) format = opt.keyid_format; if (format == KF_DEFAULT) - format = KF_SHORT; + format = KF_NONE; switch (format) { @@ -380,7 +380,7 @@ keystrlen(void) { int format = opt.keyid_format; if (format == KF_DEFAULT) - format = KF_SHORT; + format = KF_NONE; switch(format) {