From 62ff9a5e89a2d87665cc9c43273b57387146129a Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 5 Nov 2002 02:17:48 +0000 Subject: [PATCH] * g10.c (main): Add a mostly noop --trust-model option to smooth transition to 1.4. --- g10/ChangeLog | 5 +++++ g10/g10.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/g10/ChangeLog b/g10/ChangeLog index 43cb09f47..097039d2c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-11-04 David Shaw + + * g10.c (main): Add a mostly noop --trust-model option to smooth + transition to 1.4. + 2002-10-31 David Shaw * build-packet.c (do_plaintext), encode.c (encode_sesskey, diff --git a/g10/g10.c b/g10/g10.c index c262abfe5..edb5a8fc4 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -203,6 +203,7 @@ enum cmd_and_opt_values { aNull = 0, oCompressKeys, oCompressSigs, oAlwaysTrust, + oTrustModel, oEmuChecksumBug, oRunAsShmCP, oSetFilename, @@ -513,6 +514,7 @@ static ARGPARSE_OPTS opts[] = { { oCompressSigs, "compress-sigs",0, "@"}, { oDefCertCheckLevel, "default-cert-check-level", 1, "@"}, { oAlwaysTrust, "always-trust", 0, "@"}, + { oTrustModel, "trust-model", 2, "@"}, { oEmuChecksumBug, "emulate-checksum-bug", 0, "@"}, { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" }, { oSetFilename, "set-filename", 2, "@" }, @@ -1394,6 +1396,14 @@ main( int argc, char **argv ) case oCompressKeys: opt.compress_keys = 1; break; case aListSecretKeys: set_cmd( &cmd, aListSecretKeys); 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: #ifndef __riscos__ #if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__)