From 928dba9e708cf8955e32371b762fd47ea251ee3d Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 30 Jul 2002 16:48:21 +0000 Subject: * options.h, g10.c (main), mainproc.c (proc_encrypted): Return a decryption failed error if a MDC does not verify. Warn if a MDC is not present (can disable via --no-mdc-warning). * exec.c (exec_write), g10.c (main), keyserver.c (keyserver_spawn): Use new DISABLE_KEYSERVER_PATH rather than FIXED_EXEC_PATH. --- g10/g10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index fc50781a2..7da518e25 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -186,6 +186,7 @@ enum cmd_and_opt_values { aNull = 0, oTrustDBName, oNoSecmemWarn, oNoPermissionWarn, + oNoMDCWarn, oNoArmor, oNoDefKeyring, oNoGreeting, @@ -491,6 +492,7 @@ static ARGPARSE_OPTS opts[] = { { oTrustDBName, "trustdb-name", 2, "@" }, { oNoSecmemWarn, "no-secmem-warning", 0, "@" }, /* used only by regression tests */ { oNoPermissionWarn, "no-permission-warning", 0, "@" }, + { oNoMDCWarn, "no-mdc-warning", 0, "@" }, { oNoArmor, "no-armor", 0, "@"}, { oNoArmor, "no-armour", 0, "@"}, { oNoDefKeyring, "no-default-keyring", 0, "@" }, @@ -1315,6 +1317,7 @@ main( int argc, char **argv ) case oCertDigestAlgo: cert_digest_string = m_strdup(pargs.r.ret_str); break; case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break; case oNoPermissionWarn: opt.no_perm_warn=1; break; + case oNoMDCWarn: opt.no_mdc_warn=1; break; case oCharset: if( set_native_charset( pargs.r.ret_str ) ) log_error(_("%s is not a valid character set\n"), @@ -1362,12 +1365,10 @@ main( int argc, char **argv ) break; case oTempDir: opt.temp_dir=pargs.r.ret_str; break; case oExecPath: -#ifndef FIXED_EXEC_PATH if(set_exec_path(pargs.r.ret_str,0)) log_error(_("unable to set exec-path to %s\n"),pargs.r.ret_str); else opt.exec_path_set=1; -#endif break; case oNotation: add_notation_data( pargs.r.ret_str, 0 ); -- cgit