diff options
| author | Werner Koch <[email protected]> | 2012-12-28 13:03:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-12-28 13:05:27 +0000 |
| commit | a9863834244fc2a58d8950977243702d12e420a1 (patch) | |
| tree | c8f43d91372f0f5a8373fbc745e5ee5d55e49d74 /g10/getkey.c | |
| parent | kbxutil: Print algo number and fold similar lines. (diff) | |
| download | gnupg-a9863834244fc2a58d8950977243702d12e420a1.tar.gz gnupg-a9863834244fc2a58d8950977243702d12e420a1.zip | |
gpg: First working support for keyboxes.
* g10/getkey.c (get_pubkey_fast): Improve the assertion.
* kbx/keybox.h: Include iobuf.h.
* kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
(KEYBOX_WITH_OPENPGP): Remove use of this macro.
(pgp_create_key_part_single): New.
(pgp_temp_store_kid): Change to use the keybox-openpgp parser.
(pgp_create_key_part): Ditto.
(pgp_create_uid_part): Ditto.
(pgp_create_sig_part): Ditto.
(pgp_create_blob_keyblock): Ditto.
(_keybox_create_openpgp_blob): Ditto.
* kbx/keybox-search.c (keybox_get_keyblock): New.
* kbx/keybox-update.c (keybox_insert_keyblock): New.
* g10/keydb.c (parse_keyblock_image):
(keydb_get_keyblock): Support keybox.
(build_keyblock_image): New.
(keydb_insert_keyblock): Support keybox.
* kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
a kbx file to stdout.
* kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
bytes.
--
Import and key listing does now work with the keybox format. It is
still quite slow and signature caching is completely missing.
Increasing the maximum allowed length for a keyblock was required due
to a 700k keyblock which inhibited kbxutil to list the file.
kbxutil's option name --import-openpgp is not quite appropriate
because it only creates KBX blobs from OpenPGP data.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 929427302..002a2be2b 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -444,8 +444,9 @@ get_pubkey_fast (PKT_public_key * pk, u32 * keyid) return G10ERR_NO_PUBKEY; } - assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY - || keyblock->pkt->pkttype == PKT_PUBLIC_SUBKEY); + assert (keyblock && keyblock->pkt + && (keyblock->pkt->pkttype == PKT_PUBLIC_KEY + || keyblock->pkt->pkttype == PKT_PUBLIC_SUBKEY)); keyid_from_pk (keyblock->pkt->pkt.public_key, pkid); if (keyid[0] == pkid[0] && keyid[1] == pkid[1]) |