diff options
| -rw-r--r-- | g10/import.c | 3 | ||||
| -rw-r--r-- | g10/parse-packet.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/g10/import.c b/g10/import.c index 657b2deb6..ba9531234 100644 --- a/g10/import.c +++ b/g10/import.c @@ -959,7 +959,8 @@ read_block( IOBUF a, unsigned int options, else if (rc ) /* (ignore errors) */ { skip_sigs = 0; - if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) + if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET + || gpg_err_code (rc) == GPG_ERR_UNKNOWN_VERSION) ; /* Do not show a diagnostic. */ else if (gpg_err_code (rc) == GPG_ERR_INV_PACKET && (pkt->pkttype == PKT_USER_ID diff --git a/g10/parse-packet.c b/g10/parse-packet.c index e0fe9c0c8..d0190fd43 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2474,7 +2474,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, } else { - log_error ("packet(%d) with unknown version %d\n", pkttype, version); + if (version == 5) + log_info ("packet(%d) with unsupported version %d\n", pkttype, version); + else + log_error ("packet(%d) with unsupported version %d\n", pkttype,version); if (list_mode) es_fputs (":key packet: [unknown version]\n", listfp); err = gpg_error (GPG_ERR_UNKNOWN_VERSION); |