mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
7c3eee80ba
commit
fbffa8209b
6 changed files with 101 additions and 26 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue