diff options
| author | David Shaw <[email protected]> | 2002-12-11 17:50:38 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-11 17:50:38 +0000 |
| commit | eb9607707e5f8e86e732b92b137cb55ff6b26c71 (patch) | |
| tree | 0b6ccb58c2439262252afe98a571aaacc8162907 /g10/import.c | |
| parent | * gpg.sgml: Clarify include-revoked and include-disabled so they match (diff) | |
| download | gnupg-eb9607707e5f8e86e732b92b137cb55ff6b26c71.tar.gz gnupg-eb9607707e5f8e86e732b92b137cb55ff6b26c71.zip | |
* tdbio.c (tdbio_read_record, tdbio_write_record): Compact the
RECTYPE_TRUST records a bit.
* g10.c (main): Comment out --list-trust-path until it can be implemented.
* import.c (import_one): Warn when importing an Elgamal primary that this
may take some time (to verify self-sigs). (chk_self_sigs): Try and cache
all self-sigs so the keyblock is written to the keyring with a good rich
cache.
* keygen.c (ask_algo): Make the Elgamal sign+encrypt warning stronger, and
remove the RSA sign+encrypt warning.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c index 654310267..eb56ee96b 100644 --- a/g10/import.c +++ b/g10/import.c @@ -583,6 +583,10 @@ 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(_("NOTE: Elgamal primary key detected - " + "this may take some time to import\n")); + if( opt.verbose ) { log_info( "pub %4u%c/%08lX %s ", nbits_from_pk( pk ), @@ -1113,6 +1117,12 @@ chk_self_sigs( const char *fname, KBNODE keyblock, continue; sig = n->pkt->pkt.signature; if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) { + + /* This just caches the sigs for later use. That way we + import a fully-cached key which speeds things up. */ + if(!opt.no_sig_cache) + check_key_signature(keyblock,n,NULL); + if( (sig->sig_class&~3) == 0x10 ) { KBNODE unode = find_prev_kbnode( keyblock, n, PKT_USER_ID ); if( !unode ) { |