diff options
| author | Werner Koch <[email protected]> | 2002-10-30 10:02:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-10-30 10:02:38 +0000 |
| commit | 321b88d0f621d369c256adb98443eed631929b5b (patch) | |
| tree | 7967992bb761c5fbec537bfcc513d6345a47ddc3 /g10/import.c | |
| parent | * w32reg.c (read_w32_registry_string): Fixed expanding of the (diff) | |
| download | gnupg-321b88d0f621d369c256adb98443eed631929b5b.tar.gz gnupg-321b88d0f621d369c256adb98443eed631929b5b.zip | |
* getkey.c (get_pubkey_direct): Renamed to...
(get_pubkey_fast): this and made extern.
(get_pubkey_byfprint_fast): New.
* import.c (import_one): Use get_pubkey_fast instead of
get_pubkey. We don't need a merged key and actually this might
lead to recursions. --> There is still a problem, though.
(revocation_present): Likewise for search by fingerprint.
* g10.c (main): Try to create the trustdb even for non-colon-mode
list-key operations. This is required because getkey needs to
know whether a a key is ultimately trusted.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index 75acbffe7..efc104ffa 100644 --- a/g10/import.c +++ b/g10/import.c @@ -626,7 +626,7 @@ import_one( const char *fname, KBNODE keyblock, int fast, /* do we have this key already in one of our pubrings ? */ pk_orig = m_alloc_clear( sizeof *pk_orig ); - rc = get_pubkey( pk_orig, keyid ); + rc = get_pubkey_fast ( pk_orig, keyid ); if( rc && rc != G10ERR_NO_PUBKEY && rc != G10ERR_UNU_PUBKEY ) { log_error( _("key %08lX: public key not found: %s\n"), (ulong)keyid[1], g10_errstr(rc)); @@ -1401,8 +1401,8 @@ revocation_present(KBNODE keyblock) itself? */ int rc; - rc=get_pubkey_byfprint(NULL,sig->revkey[idx]->fpr, - MAX_FINGERPRINT_LEN); + rc=get_pubkey_byfprint_fast (NULL,sig->revkey[idx]->fpr, + MAX_FINGERPRINT_LEN); if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY) { /* No, so try and get it */ @@ -1417,7 +1417,7 @@ revocation_present(KBNODE keyblock) MAX_FINGERPRINT_LEN); /* Do we have it now? */ - rc=get_pubkey_byfprint(NULL, + rc=get_pubkey_byfprint_fast (NULL, sig->revkey[idx]->fpr, MAX_FINGERPRINT_LEN); } |