diff options
| author | Werner Koch <[email protected]> | 2018-05-15 10:19:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-31 09:47:07 +0000 |
| commit | 26c0d3a3fc903c1a0de644ebcc99d3e665a80941 (patch) | |
| tree | 6d1c24d9088e0a9e9b1ab7df62b99ab6866ab7ef /g10/gpg.c | |
| parent | po: Update Spanish translation. (diff) | |
| download | gnupg-26c0d3a3fc903c1a0de644ebcc99d3e665a80941.tar.gz gnupg-26c0d3a3fc903c1a0de644ebcc99d3e665a80941.zip | |
gpg: Turn --no-mdc-warn into a NOP.
* g10/gpg.c (oNoMDCWarn): Remove.
(opts): Make --no-mdc-warn a NOP.
(main): Don't set var.
* g10/options.h (struct opt): Remove 'no_mdc_var'.
* g10/cipher-cfb.c (write_header): Assume opt.no_mdc_warn is false.
* g10/mainproc.c (proc_encrypted): Ditto.
--
Users should not be allowed to suppress the warning that they are
shooting into their foot.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 96350c5d5afcbc7f66c535e38b9fcc7355622855)
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -264,7 +264,6 @@ enum cmd_and_opt_values oRequireSecmem, oNoRequireSecmem, oNoPermissionWarn, - oNoMDCWarn, oNoArmor, oNoDefKeyring, oNoKeyring, @@ -727,7 +726,6 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oRequireSecmem, "require-secmem", "@"), ARGPARSE_s_n (oNoRequireSecmem, "no-require-secmem", "@"), ARGPARSE_s_n (oNoPermissionWarn, "no-permission-warning", "@"), - ARGPARSE_s_n (oNoMDCWarn, "no-mdc-warning", "@"), ARGPARSE_s_n (oNoArmor, "no-armor", "@"), ARGPARSE_s_n (oNoArmor, "no-armour", "@"), ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"), @@ -911,6 +909,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oNoop, "no-force-v3-sigs", "@"), ARGPARSE_s_n (oNoop, "force-v4-certs", "@"), ARGPARSE_s_n (oNoop, "no-force-v4-certs", "@"), + ARGPARSE_s_n (oNoop, "no-mdc-warning", "@"), ARGPARSE_end () }; @@ -3156,7 +3155,6 @@ main (int argc, char **argv) case oRequireSecmem: require_secmem=1; break; case oNoRequireSecmem: require_secmem=0; break; case oNoPermissionWarn: opt.no_perm_warn=1; break; - case oNoMDCWarn: opt.no_mdc_warn=1; break; case oDisplayCharset: if( set_native_charset( pargs.r.ret_str ) ) log_error(_("'%s' is not a valid character set\n"), |