security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

kbx: Support v5key for short kid and long kid.

Browse Source 
* kbx/keybox-search.c (has_short_kid): Support v5key.
(has_long_kid): Likewise.

GnuPG-bug-id: 5000
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-08-06 19:24:49 +09:00
parent 0774482257
commit df531848a9
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kbx/keybox-search.c
View File

@ -685,18 +685,44 @@ blob_x509_has_grip (KEYBOXBLOB blob, const unsigned char *grip)
static inline int static inline int
has_short_kid (KEYBOXBLOB blob, u32 lkid) has_short_kid (KEYBOXBLOB blob, u32 lkid)
{ {
const unsigned char *buffer;
size_t length;
int fpr32;
unsigned char buf[4]; unsigned char buf[4];
buffer = _keybox_get_blob_image (blob, &length);
if (length < 48)
return 0; /* blob too short */
fpr32 = buffer[5] == 2;
if (fpr32 && length < 56)
return 0; /* blob to short */
buf[0] = lkid >> 24; buf[0] = lkid >> 24;
buf[1] = lkid >> 16; buf[1] = lkid >> 16;
buf[2] = lkid >> 8; buf[2] = lkid >> 8;
buf[3] = lkid; buf[3] = lkid;
return blob_cmp_fpr_part (blob, buf, 16, 4);
if (fpr32)
return blob_cmp_fpr_part (blob, buf, 0, 4);
else
return blob_cmp_fpr_part (blob, buf, 16, 4);
} }
static inline int static inline int
has_long_kid (KEYBOXBLOB blob, u32 mkid, u32 lkid) has_long_kid (KEYBOXBLOB blob, u32 mkid, u32 lkid)
{ {
const unsigned char *buffer;
size_t length;
int fpr32;
unsigned char buf[8]; unsigned char buf[8];
buffer = _keybox_get_blob_image (blob, &length);
if (length < 48)
return 0; /* blob too short */
fpr32 = buffer[5] == 2;
if (fpr32 && length < 56)
return 0; /* blob to short */
buf[0] = mkid >> 24; buf[0] = mkid >> 24;
buf[1] = mkid >> 16; buf[1] = mkid >> 16;
buf[2] = mkid >> 8; buf[2] = mkid >> 8;
@ -705,7 +731,11 @@ has_long_kid (KEYBOXBLOB blob, u32 mkid, u32 lkid)
buf[5] = lkid >> 16; buf[5] = lkid >> 16;
buf[6] = lkid >> 8; buf[6] = lkid >> 8;
buf[7] = lkid; buf[7] = lkid;
return blob_cmp_fpr_part (blob, buf, 12, 8);
if (fpr32)
return blob_cmp_fpr_part (blob, buf, 0, 8);
else
return blob_cmp_fpr_part (blob, buf, 12, 8);
} }
static inline int static inline int