aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyid.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-08-31 06:37:51 +0000
committerWerner Koch <[email protected]>2016-08-31 06:48:28 +0000
commit76304a971fe507ea659b952932ea899463ab7166 (patch)
treea27eb7def84ae8d69fb469975d4ef3e6a7131181 /g10/keyid.c
parentg10: Improve TOFU batch update code. (diff)
downloadgnupg-76304a971fe507ea659b952932ea899463ab7166.tar.gz
gnupg-76304a971fe507ea659b952932ea899463ab7166.zip
gpg: Fix regression in gpgv's printing of the keyid.
* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT. -- Debian-bug-id: 836144 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keyid.c')
-rw-r--r--g10/keyid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index ea6ed5ef0..4380151ee 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -403,6 +403,8 @@ keystr (u32 *keyid)
static char keyid_str[KEYID_STR_SIZE];
int format = opt.keyid_format;
+ if (format == KF_DEFAULT)
+ format = KF_NONE;
if (format == KF_NONE)
format = KF_LONG;