mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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 <wk@gnupg.org>
This commit is contained in:
parent
2bc1ec2944
commit
adec6a84f6
5 changed files with 15 additions and 21 deletions
12
g10/keydb.c
12
g10/keydb.c
|
@ -487,15 +487,11 @@ keydb_search_desc_dump (struct keydb_search_desc *desc)
|
|||
case KEYDB_SEARCH_MODE_ISSUER:
|
||||
return xasprintf ("ISSUER: '%s'", desc->u.name);
|
||||
case KEYDB_SEARCH_MODE_ISSUER_SN:
|
||||
return xasprintf ("ISSUER_SN: '%*s'",
|
||||
(int) (desc->snlen == -1
|
||||
? strlen (desc->sn) : desc->snlen),
|
||||
desc->sn);
|
||||
return xasprintf ("ISSUER_SN: '#%.*s/%s'",
|
||||
(int)desc->snlen,desc->sn, desc->u.name);
|
||||
case KEYDB_SEARCH_MODE_SN:
|
||||
return xasprintf ("SN: '%*s'",
|
||||
(int) (desc->snlen == -1
|
||||
? strlen (desc->sn) : desc->snlen),
|
||||
desc->sn);
|
||||
return xasprintf ("SN: '%.*s'",
|
||||
(int)desc->snlen, desc->sn);
|
||||
case KEYDB_SEARCH_MODE_SUBJECT:
|
||||
return xasprintf ("SUBJECT: '%s'", desc->u.name);
|
||||
case KEYDB_SEARCH_MODE_KEYGRIP:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue