gpg: Do not print a the short keyid if the high word is zero.

* g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-07-13 17:19:56 +02:00
parent e148c3caa9
commit 7b96a8d736
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 10 deletions

View File

@ -347,11 +347,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
break;
case KF_LONG:
if (keyid[0])
snprintf (buffer, len, "%08lX%08lX",
(ulong)keyid[0], (ulong)keyid[1]);
else
snprintf (buffer, len, "%08lX", (ulong)keyid[1]);
snprintf (buffer, len, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1]);
break;
case KF_0xSHORT:
@ -359,11 +355,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
break;
case KF_0xLONG:
if(keyid[0])
snprintf (buffer, len, "0x%08lX%08lX",
(ulong)keyid[0],(ulong)keyid[1]);
else
snprintf (buffer, len, "0x%08lX", (ulong)keyid[1]);
snprintf (buffer, len, "0x%08lX%08lX", (ulong)keyid[0],(ulong)keyid[1]);
break;
default: