diff options
| author | David Shaw <[email protected]> | 2003-12-11 01:07:42 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-11 01:07:42 +0000 |
| commit | db5ab5e730c6cf2dd103967a305b3519c6c808b3 (patch) | |
| tree | cc2192da8e6a9e685b64378c60bef5f40443a914 /g10/import.c | |
| parent | * keyid.c (do_fingerprint_md): Remove the rules to hash the old v3 Elgamal (diff) | |
| download | gnupg-db5ab5e730c6cf2dd103967a305b3519c6c808b3.tar.gz gnupg-db5ab5e730c6cf2dd103967a305b3519c6c808b3.zip | |
* packet.h, build-packet.c (hash_public_key): Remove function ...
* keydb.h, keyid.c (hash_public_key, do_fingerprint_md): ... and make a
new one here that shares code with the fingerprint calculations. This
removes some duplicated functionality, and is also around 14% faster.
(Every bit helps).
* import.c (import_one): No longer need the Elgamal import warning.
* getkey.c (get_pubkey_fast): This one is sort of obscure. get_pubkey_fast
returns the primary key when requesting a subkey, so if a user has a key
signed by a subkey (we don't do this, but used to), AND that key is not
self-signed, AND the algorithm of the subkey in question is not present in
GnuPG, AND the algorithm of the primary key that owns the subkey in
question is present in GnuPG, then we will try and verify the subkey
signature using the primary key algorithm and hit a BUG(). The fix is to
not return a hit if the keyid is not the primary. All other users of
get_pubkey_fast already expect a primary only.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index c5bcb595c..d13357b6a 100644 --- a/g10/import.c +++ b/g10/import.c @@ -559,10 +559,6 @@ import_one( const char *fname, KBNODE keyblock, keyid_from_pk( pk, keyid ); uidnode = find_next_kbnode( keyblock, PKT_USER_ID ); - if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL) - log_info(_("key %08lX: Elgamal primary key -" - " this may take some time to import\n"),(ulong)keyid[1]); - if( opt.verbose && !opt.interactive ) { log_info( "pub %4u%c/%08lX %s ", nbits_from_pk( pk ), |