diff options
| author | Werner Koch <[email protected]> | 2015-01-22 11:14:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-01-22 13:39:31 +0000 |
| commit | 6f3d11d8837b00e3a1c4fa881066855c0321d6b2 (patch) | |
| tree | 94da016d334f26bc36f3f8103dd56be6bd25455b /g10/getkey.c | |
| parent | gpg: Replace remaining old error code macros by GPG_ERR_. (diff) | |
| download | gnupg-6f3d11d8837b00e3a1c4fa881066855c0321d6b2.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index d240dd7d1..62d2d3306 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -403,8 +403,6 @@ get_pubkey (PKT_public_key * pk, u32 * keyid) if (!rc) goto leave; - log_debug ("looking up key %08X%08X failed: %s\n", keyid[0], keyid[1], - gpg_strerror (rc)); rc = GPG_ERR_NO_PUBKEY; leave: @@ -2573,7 +2571,8 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret) } found: - if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND) + if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND + && gpg_err_code (rc) != GPG_ERR_LEGACY_KEY) log_error ("keydb_search failed: %s\n", gpg_strerror (rc)); if (!rc) |