diff options
| author | David Shaw <[email protected]> | 2002-11-13 17:43:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-13 17:43:27 +0000 |
| commit | fbffa8209b79a2a1815c4c692b2bec709c0f24c7 (patch) | |
| tree | 8ed3a1cb26cbc91bd176beb7a20bdb66232f5b26 /g10/import.c | |
| parent | * exec.c [__CYGWIN32__]: Keep cygwin separate from Mingw32; we don't need (diff) | |
| download | gnupg-fbffa8209b79a2a1815c4c692b2bec709c0f24c7.tar.gz gnupg-fbffa8209b79a2a1815c4c692b2bec709c0f24c7.zip | |
* encode.c (encode_simple): Make sure that files larger than about 4G use
partial length encoding. This is required because OpenPGP allows only for
32 bit length fields. From Werner on stable branch.
* getkey.c (get_pubkey_direct): Renamed to... (get_pubkey_fast): this and
made extern. (get_pubkey_byfprint_fast): New. From Werner on stable
branch.
* keydb.h, 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. (revocation_present): Likewise for search by fingerprint.
From Werner on stable branch.
* 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. From Werner on stable branch.
Diffstat (limited to '')
| -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 2ff06b51d..d06d957c2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -638,7 +638,7 @@ import_one( const char *fname, KBNODE keyblock, /* 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)); @@ -1476,8 +1476,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 */ @@ -1492,7 +1492,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); } |