security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-17 20:27:03 +02:00
Code Activity

* g10.c (main): Add a mostly noop --trust-model option to smooth

Browse Source 
transition to 1.4.
This commit is contained in:
David Shaw 2002-11-05 02:17:48 +00:00
parent 8078c08969
commit 62ff9a5e89
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-04 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Add a mostly noop --trust-model option to smooth
transition to 1.4.
2002-10-31 David Shaw <dshaw@jabberwocky.com> 2002-10-31 David Shaw <dshaw@jabberwocky.com>
* build-packet.c (do_plaintext), encode.c (encode_sesskey, * build-packet.c (do_plaintext), encode.c (encode_sesskey,

10
g10/g10.c
View File

@ -203,6 +203,7 @@ enum cmd_and_opt_values { aNull = 0,
oCompressKeys, oCompressKeys,
oCompressSigs, oCompressSigs,
oAlwaysTrust, oAlwaysTrust,
oTrustModel,
oEmuChecksumBug, oEmuChecksumBug,
oRunAsShmCP, oRunAsShmCP,
oSetFilename, oSetFilename,
@ -513,6 +514,7 @@ static ARGPARSE_OPTS opts[] = {
{ oCompressSigs, "compress-sigs",0, "@"}, { oCompressSigs, "compress-sigs",0, "@"},
{ oDefCertCheckLevel, "default-cert-check-level", 1, "@"}, { oDefCertCheckLevel, "default-cert-check-level", 1, "@"},
{ oAlwaysTrust, "always-trust", 0, "@"}, { oAlwaysTrust, "always-trust", 0, "@"},
{ oTrustModel, "trust-model", 2, "@"},
{ oEmuChecksumBug, "emulate-checksum-bug", 0, "@"}, { oEmuChecksumBug, "emulate-checksum-bug", 0, "@"},
{ oRunAsShmCP, "run-as-shm-coprocess", 4, "@" }, { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" },
{ oSetFilename, "set-filename", 2, "@" }, { oSetFilename, "set-filename", 2, "@" },
@ -1394,6 +1396,14 @@ main( int argc, char **argv )
case oCompressKeys: opt.compress_keys = 1; break; case oCompressKeys: opt.compress_keys = 1; break;
case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); break; case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); break;
case oAlwaysTrust: opt.always_trust = 1; break; case oAlwaysTrust: opt.always_trust = 1; break;
case oTrustModel:
if(ascii_strcasecmp(pargs.r.ret_str,"classic")==0)
opt.always_trust=0;
else if(ascii_strcasecmp(pargs.r.ret_str,"always")==0)
opt.always_trust=1;
else
log_error("unknown trust model \"%s\"\n",pargs.r.ret_str);
break;
case oLoadExtension: case oLoadExtension:
#ifndef __riscos__ #ifndef __riscos__
#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__) #if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__)