g10: Make force-mdc the default.fix-T3995dkg/fix-T3995

* 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 <[email protected]>

2 files changed, 8 insertions, 4 deletions

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 544ed1817..6f804bdf4 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2600,11 +2600,14 @@ This option requires the use of option @option{--rfc4880bis} to
 declare that a not yet standardized feature is used.
 
 @item --force-mdc
+@item --no-force-mdc
 @opindex force-mdc
-Force the use of encryption with a modification detection code. This
-is always used with the newer ciphers (those with a blocksize greater
-than 64 bits), or if all of the recipient keys indicate MDC support in
-their feature flags.
+Force (or do not force) the use of encryption with a modification
+detection code.  The default is to always force the MDC when
+encrypting (@option{--force-mdc}).  If @option{--no-force-mdc} is
+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
 @opindex disable-mdc
diff --git a/g10/gpg.c b/g10/gpg.c
index e718fe45e..4fc087451 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2443,6 +2443,7 @@ main (int argc, char **argv)
     opt.passphrase_repeat = 1;
     opt.emit_version = 0;
     opt.weak_digests = NULL;
+    opt.force_mdc = 1;
 
     /* Check whether we have a config file on the command line.  */
     orig_argc = argc;