security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Fix bug 1091.

Browse source 
Doc fixes.
Replace assert by error message.
This commit is contained in:
Werner Koch 2009-07-20 11:02:20 +00:00
parent d56084296c
commit 7ae15f0027
4 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/keyring.c
View file

@ -1440,7 +1440,20 @@ keyring_rebuild_cache (void *token,int noisy)
log_error ("keyring_get_keyblock failed: %s\n", g10_errstr(rc));
goto leave;
}
assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY)
{
/* We had a few reports about corrupted keyrings; if we have
been called directly from the command line we delete such
a keyblock instead of bailing out. */
log_error ("unexpected keyblock found (pkttype=%d)%s\n",
keyblock->pkt->pkttype, noisy? " - deleted":"");
if (noisy)
continue;
log_info ("Hint: backup your keys and try running `%s'\n",
"gpg --rebuild-keydb-caches");
rc = gpg_error (GPG_ERR_INV_KEYRING);
goto leave;
}
/* check all signature to set the signature's cache flags */
for (node=keyblock; node; node=node->next)