security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

gpg: No need to create a trustdb when encrypting with --always-trust.

Browse Source 
* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
--

Signed-off-by: Werner Koch <wk@gnupg.org>

(cherry picked from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)
This commit is contained in:
Werner Koch 2013-08-02 09:10:17 +02:00
parent 4f90c7b914
commit 7c028efc18
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
g10/gpg.c
View File

@ -3389,7 +3389,8 @@ main (int argc, char **argv)
if(fname && utf8_strings) if(fname && utf8_strings)
opt.flags.utf8_filename=1; opt.flags.utf8_filename=1;
switch( cmd ) { switch (cmd)
{
case aPrimegen: case aPrimegen:
case aPrintMD: case aPrintMD:
case aPrintMDs: case aPrintMDs:
@ -3398,12 +3399,24 @@ main (int argc, char **argv)
case aEnArmor: case aEnArmor:
break; break;
case aFixTrustDB: case aFixTrustDB:
case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break; case aExportOwnerTrust:
case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break; rc = setup_trustdb (0, trustdb_name);
default: rc = setup_trustdb(1, trustdb_name ); break; break;
} case aListTrustDB:
if( rc ) rc = setup_trustdb (argc? 1:0, trustdb_name);
log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc)); break;
case aEncr:
case aEncrFiles:
/* If we are using TM_ALWAYS, we do not need to create the
trustdb. */
rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
break;
default:
rc = setup_trustdb (1, trustdb_name );
break;
}
if (rc)
log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
switch (cmd) switch (cmd)