diff options
| author | Werner Koch <wk@gnupg.org> | 2015-01-22 12:14:48 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-01-22 14:39:31 +0100 |
| commit | 6f3d11d8837b00e3a1c4fa881066855c0321d6b2 (patch) | |
| tree | 94da016d334f26bc36f3f8103dd56be6bd25455b /g10/keyring.c | |
| parent | gpg: Replace remaining old error code macros by GPG_ERR_. (diff) | |
| download | gnupg2-6f3d11d8837b00e3a1c4fa881066855c0321d6b2.tar.xz gnupg2-6f3d11d8837b00e3a1c4fa881066855c0321d6b2.zip | |
gpg: Add dedicated error code for PGP-2 keys.
* g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
keys.
* g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
* g10/getkey.c (lookup): Silence error message for PGP-2 keys.
* common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
libgpg-error.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/keyring.c')
| -rw-r--r-- | g10/keyring.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/g10/keyring.c b/g10/keyring.c index 7ac3478ad..34829e711 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -350,7 +350,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes) /* - * Return the last found keyring. Caller must free it. + * Return the last found keyblock. Caller must free it. * The returned keyblock has the kbode flag bit 0 set for the node with * the public key used to locate the keyblock or flag bit 1 set for * the user ID node. @@ -1409,8 +1409,6 @@ keyring_rebuild_cache (void *token,int noisy) goto leave; } - log_debug ("keblock with version %d\n", - keyblock->pkt->pkt.public_key->version); if (keyblock->pkt->pkt.public_key->version < 4) { /* We do not copy/cache v3 keys or any other unknown |