g10: Make force-mdc the default.

* g10/gpg.c: (main) initialize opt.force_mdc to 1.
* doc/gpg.texi: update documentation about --force-mdc
--

GnuPG-bug-id: 3995
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2018-05-25 12:27:15 -04:00
parent d1431901f0
commit 3308d5e3f4
2 changed files with 8 additions and 4 deletions

View File

@ -2600,11 +2600,14 @@ This option requires the use of option @option{--rfc4880bis} to
declare that a not yet standardized feature is used. declare that a not yet standardized feature is used.
@item --force-mdc @item --force-mdc
@item --no-force-mdc
@opindex force-mdc @opindex force-mdc
Force the use of encryption with a modification detection code. This Force (or do not force) the use of encryption with a modification
is always used with the newer ciphers (those with a blocksize greater detection code. The default is to always force the MDC when
than 64 bits), or if all of the recipient keys indicate MDC support in encrypting (@option{--force-mdc}). If @option{--no-force-mdc} is
their feature flags. given, the MDC may be skipped when using older ciphers (those with a
blocksize 64 bits or less), and if some of the recipient keys do not
indicate MDC support in their feature flags.
@item --disable-mdc @item --disable-mdc
@opindex disable-mdc @opindex disable-mdc

View File

@ -2443,6 +2443,7 @@ main (int argc, char **argv)
opt.passphrase_repeat = 1; opt.passphrase_repeat = 1;
opt.emit_version = 0; opt.emit_version = 0;
opt.weak_digests = NULL; opt.weak_digests = NULL;
opt.force_mdc = 1;
/* Check whether we have a config file on the command line. */ /* Check whether we have a config file on the command line. */
orig_argc = argc; orig_argc = argc;