diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/keydb.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index 03fadfd54..0475f8561 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1249,9 +1249,12 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no, } if (err) { - log_error ("parse_keyblock_image: read error: %s\n", - gpg_strerror (err)); - err = gpg_error (GPG_ERR_INV_KEYRING); + if (gpg_err_code (err) != GPG_ERR_UNKNOWN_VERSION) + { + log_error ("parse_keyblock_image: read error: %s\n", + gpg_strerror (err)); + err = gpg_error (GPG_ERR_INV_KEYRING); + } break; } @@ -1955,7 +1958,9 @@ keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc, rc = keybox_search (hd->active[hd->current].u.kb, desc, ndesc, KEYBOX_BLOBTYPE_PGP, descindex, &hd->skipped_long_blobs); - while (rc == GPG_ERR_LEGACY_KEY); + while (gpg_err_code (rc) == GPG_ERR_LEGACY_KEY + || gpg_err_code (rc) == GPG_ERR_UNKNOWN_VERSION) + ; break; } |