security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

gpg: Don't let gpg return failure on an invalid packet in a keyblock.

Browse Source 
* g10/keydb.c (parse_keyblock_image): Use log_info instead of
log_error for skipped packets.
* g10/keyring.c (keyring_get_keyblock): Ditto.
--

log_info should be sufficient and makes this more robust.  Some
tools (e.g. Enigmail) are too picky on return codes from gpg.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-02-22 14:23:01 +01:00
parent 88e766d391
commit b375d50ee4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/keydb.c
View File

@ -1269,10 +1269,7 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no,
break; /* Allowed per RFC. */ break; /* Allowed per RFC. */
default: default:
/* Note that can't allow ring trust packets here and some of log_info ("skipped packet of type %d in keybox\n", (int)pkt->pkttype);
the other GPG specific packets don't make sense either. */
log_error ("skipped packet of type %d in keybox\n",
(int)pkt->pkttype);
free_packet(pkt, &parsectx); free_packet(pkt, &parsectx);
init_packet(pkt); init_packet(pkt);
continue; continue;

4
g10/keyring.c
View File

@ -459,8 +459,8 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
break; /* Allowed by us. */ break; /* Allowed by us. */
default: default:
log_error ("skipped packet of type %d in keyring\n", log_info ("skipped packet of type %d in keyring\n",
(int)pkt->pkttype); (int)pkt->pkttype);
free_packet(pkt, &parsectx); free_packet(pkt, &parsectx);
init_packet(pkt); init_packet(pkt);
continue; continue;