diff options
| author | Werner Koch <[email protected]> | 2020-09-08 08:05:08 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-09-09 18:34:59 +0000 |
| commit | adec6a84f6ee176764391da358ae150f92b1f1e4 (patch) | |
| tree | 87c059fa99ed5ee202bb1c67a9214b70c322ccf9 /kbx/keybox-search.c | |
| parent | gpg,tools: Add handling of supported algorithms by a card. (diff) | |
| download | gnupg-adec6a84f6ee176764391da358ae150f92b1f1e4.tar.gz gnupg-adec6a84f6ee176764391da358ae150f92b1f1e4.zip | |
kbx: Change X.509 S/N search definition.
* kbx/keybox-search-desc.h (struct keydb_search_desc): Do not overload
SNLLEN with a hex flag. Add SNHEX.
* kbx/keybox-search.c (keybox_search): Adjust.
* common/userids.c (classify_user_id): Adjust.
* sm/keydb.c (keydb_search_desc_dump): Adjust.
* g10/keydb.c (keydb_search_desc_dump): Adjust.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keybox-search.c')
| -rw-r--r-- | kbx/keybox-search.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 67862a376..c07cd48c9 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -982,7 +982,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, } if (desc[n].skipfnc) any_skip = 1; - if (desc[n].snlen == -1 && !sn_array) + if (desc[n].snhex && !sn_array) { sn_array = xtrycalloc (ndesc, sizeof *sn_array); if (!sn_array) @@ -1042,12 +1042,12 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, { if (!desc[n].sn) ; - else if (desc[n].snlen == -1) + else if (desc[n].snhex) { unsigned char *sn; s = desc[n].sn; - for (i=0; *s && *s != '/'; s++, i++) + for (i=0; *s && *s != '/' && i < desc[n].snlen; s++, i++) ; odd = (i & 1); snlen = (i+1)/2; |