diff options
| author | Werner Koch <[email protected]> | 2016-07-13 15:19:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-13 15:19:56 +0000 |
| commit | 7b96a8d736934e65bb2adbc17059f84dfeaf95fb (patch) | |
| tree | 5587ad9fc5c921bae97268a157160530d1039429 /g10/keyid.c | |
| parent | gpg: New option --mimemode. (diff) | |
| download | gnupg-7b96a8d736934e65bb2adbc17059f84dfeaf95fb.tar.gz gnupg-7b96a8d736934e65bb2adbc17059f84dfeaf95fb.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/keyid.c')
| -rw-r--r-- | g10/keyid.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index e67f67f65..84990a30d 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -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: |