mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-20 01:02:44 +02:00
f40e9d6a52
* common/userids.c (classify_user_id): Support 32 byte fingerprints. * kbx/keybox-search-desc.h (KEYDB_SEARCH_MODE_FPR32): New. (struct keydb_search_desc): Add field fprlen. * kbx/keybox-defs.h (struct _keybox_openpgp_key_info): Add field version and increase size of fpr to 32. * kbx/keybox-blob.c: Define new version 2 for PGP and X509 blobs. (struct keyboxblob_key): Add field fprlen and increase size of fpr. (pgp_create_key_part_single): Allow larger fingerprints. (create_blob_header): Implement blob version 2 and add arg want_fpr32. (_keybox_create_openpgp_blob): Detect the need for blob version 2. * kbx/keybox-search.c (blob_get_first_keyid): Support 32 byte fingerprints. (blob_cmp_fpr): Ditto. (blob_cmp_fpr_part): Ditto. (has_fingerprint): Add arg fprlen and pass on. (keybox_search): Support KEYDB_SEARCH_MODE_FPR32 and adjust for changed has_fingerprint. * kbx/keybox-openpgp.c (parse_key): Support version 5 keys. * kbx/keybox-dump.c (_keybox_dump_blob): Support blob version 2. * g10/delkey.c (do_delete_key): Support KEYDB_SEARCH_MODE_FPR32. * g10/export.c (exact_subkey_match_p): Ditto. * g10/gpg.c (main): Ditto. * g10/getkey.c (get_pubkey_byfprint): Adjust for changed KEYDB_SEARCH_MODE_FPR. * g10/keydb.c (keydb_search_desc_dump): Support KEYDB_SEARCH_MODE_FPR32 and adjust for changed KEYDB_SEARCH_MODE_FPR. (keydb_search): Add new arg fprlen and change all callers. * g10/keyedit.c (find_by_primary_fpr): Ditto. * g10/keyid.c (keystr_from_desc): Ditto. * g10/keyring.c (keyring_search): Ditto. * g10/keyserver.c (print_keyrec): Ditto. (parse_keyrec): Ditto. (keyserver_export): Ditto. (keyserver_retrieval_screener): Ditto. (keyserver_import): Ditto. (keyserver_import_fprint): Ditto. (keyidlist): Ditto. (keyserver_get_chunk): Ditto. * g10/keydb.c (keydb_search): Add new arg fprlen and change all callers. * sm/keydb.c (keydb_search_fpr): Adjust for changed KEYDB_SEARCH_MODE_FPR. -- This prepares the support for OpenPGP v5 keys. The new version 2 blob format is needed for the longer fingerprints and we also use this opportunity to prepare for storing the keygrip in the blob for faster lookup by keygrip. Right now this is not yet functional. Signed-off-by: Werner Koch <wk@gnupg.org>
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/* keybox-search-desc.h - Keybox serch description
|
|
* Copyright (C) 2001 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/*
|
|
This file is a temporary kludge until we can come up with solution
|
|
to share this description between keybox and the application
|
|
specific keydb
|
|
*/
|
|
|
|
#ifndef KEYBOX_SEARCH_DESC_H
|
|
#define KEYBOX_SEARCH_DESC_H 1
|
|
|
|
typedef enum {
|
|
KEYDB_SEARCH_MODE_NONE,
|
|
KEYDB_SEARCH_MODE_EXACT,
|
|
KEYDB_SEARCH_MODE_SUBSTR,
|
|
KEYDB_SEARCH_MODE_MAIL,
|
|
KEYDB_SEARCH_MODE_MAILSUB,
|
|
KEYDB_SEARCH_MODE_MAILEND,
|
|
KEYDB_SEARCH_MODE_WORDS,
|
|
KEYDB_SEARCH_MODE_SHORT_KID,
|
|
KEYDB_SEARCH_MODE_LONG_KID,
|
|
KEYDB_SEARCH_MODE_FPR16,
|
|
KEYDB_SEARCH_MODE_FPR20,
|
|
KEYDB_SEARCH_MODE_FPR32,
|
|
KEYDB_SEARCH_MODE_FPR, /* (Length of fpr in .fprlen) */
|
|
KEYDB_SEARCH_MODE_ISSUER,
|
|
KEYDB_SEARCH_MODE_ISSUER_SN,
|
|
KEYDB_SEARCH_MODE_SN,
|
|
KEYDB_SEARCH_MODE_SUBJECT,
|
|
KEYDB_SEARCH_MODE_KEYGRIP,
|
|
KEYDB_SEARCH_MODE_FIRST,
|
|
KEYDB_SEARCH_MODE_NEXT
|
|
} KeydbSearchMode;
|
|
|
|
|
|
/* Forward declaration. See g10/packet.h. */
|
|
struct gpg_pkt_user_id_s;
|
|
typedef struct gpg_pkt_user_id_s *gpg_pkt_user_id_t;
|
|
|
|
/* A search descriptor. */
|
|
struct keydb_search_desc
|
|
{
|
|
KeydbSearchMode mode;
|
|
/* Callback used to filter results. The first parameter is
|
|
SKIPFUNCVALUE. The second is the keyid. The third is the
|
|
1-based index of the UID packet that matched the search criteria
|
|
(or 0, if none).
|
|
|
|
Return non-zero if the result should be skipped. */
|
|
int (*skipfnc)(void *, u32 *, int);
|
|
void *skipfncvalue;
|
|
const unsigned char *sn;
|
|
int snlen; /* -1 := sn is a hex string */
|
|
union {
|
|
const char *name;
|
|
unsigned char fpr[32];
|
|
u32 kid[2]; /* Note that this is in native endianness. */
|
|
unsigned char grip[20];
|
|
} u;
|
|
byte fprlen; /* Only used with KEYDB_SEARCH_MODE_FPR. */
|
|
int exact; /* Use exactly this key ('!' suffix in gpg). */
|
|
};
|
|
|
|
|
|
struct keydb_search_desc;
|
|
typedef struct keydb_search_desc KEYDB_SEARCH_DESC;
|
|
typedef struct keydb_search_desc KEYBOX_SEARCH_DESC;
|
|
|
|
|
|
|
|
#endif /*KEYBOX_SEARCH_DESC_H*/
|