security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-06 23:17:47 +02:00
Code Activity

kbx: Call skipfnc callback to filter out keys

Browse Source 
* kbx/keybox-search.c (blob_get_keyid): New.
(keybox-search): Call skipfnc callback function.
--

This patch (tentatively) fixes
GnuPG-bug-id: 1794

The keybox_search function in kbx/keybox-search.c currently ignores
the skipfnc callback, but the validate_key_list function in
g10/trustdb.c uses such a callback to exclude ultimately trusted keys.
This commit is contained in:
Damien Goutte-Gattat 2015-01-16 16:56:35 +01:00 committed by Werner Koch
parent 3da53e70b1
commit c5956592c1
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kbx/keybox-search.c
View File

@ -79,6 +79,30 @@ blob_get_blob_flags (KEYBOXBLOB blob)
} }
static int
blob_get_keyid (KEYBOXBLOB blob, u32 *kid)
{
const unsigned char *buffer;
size_t length, keyinfolen;
buffer = _keybox_get_blob_image (blob, &length);
if (length < 48)
return 0; /* blob too short */
if (buffer[4] != KEYBOX_BLOBTYPE_PGP)
return 0; /* don't know what to do with X.509 blobs */
keyinfolen = get16 (buffer + 18);
if (keyinfolen < 28)
return 0; /* invalid blob */
kid[0] = get32 (buffer + 32);
kid[1] = get32 (buffer + 36);
return 1;
}
/* Return information on the flag WHAT within the blob BUFFER,LENGTH. /* Return information on the flag WHAT within the blob BUFFER,LENGTH.
Return the offset and the length (in bytes) of the flag in Return the offset and the length (in bytes) of the flag in
FLAGOFF,FLAG_SIZE. */ FLAGOFF,FLAG_SIZE. */
@ -967,9 +991,12 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc,
*r_descindex = n; *r_descindex = n;
for (n=any_skip?0:ndesc; n < ndesc; n++) for (n=any_skip?0:ndesc; n < ndesc; n++)
{ {
/* if (desc[n].skipfnc */ u32 kid[2];
/* && desc[n].skipfnc (desc[n].skipfncvalue, aki, NULL)) */
/* break; */ if (desc[n].skipfnc
&& blob_get_keyid (blob, kid)
&& desc[n].skipfnc (desc[n].skipfncvalue, kid, NULL))
break;
} }
if (n == ndesc) if (n == ndesc)
break; /* got it */ break; /* got it */