* 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.

1 files changed, 0 insertions, 7 deletions

diff --git a/g10/g10.c b/g10/g10.c
index ba5ae58a2..62a1a9ad0 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2078,13 +2078,6 @@ main( int argc, char **argv )
       case aEnArmor:
       case aFixTrustDB:
 	break;
-      case aKMode:
-      case aListKeys:
-      case aListSecretKeys:
-      case aCheckKeys:
-	if( opt.with_colons ) /* need this to list the trust */
-	    rc = setup_trustdb(1, trustdb_name );
-	break;
       case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
       case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
       default: rc = setup_trustdb(1, trustdb_name ); break;