[git] GnuPG - branch, fix-T3995, created. gnupg-2.2.7-128-g371b4bd

[by Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, fix-T3995 has been created
        at  371b4bd2dd2d0501b48845dadeb4fd8ad37d5c86 (commit)

- Log -----------------------------------------------------------------
commit 371b4bd2dd2d0501b48845dadeb4fd8ad37d5c86
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri May 25 12:27:15 2018 -0400

    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 at fifthhorseman.net>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 544ed18..452876d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2599,12 +2599,14 @@ method.  See also options @option{--aead-algo} and
 This option requires the use of option @option{--rfc4880bis} to
 declare that a not yet standardized feature is used.
 
+ at item --no-force-mdc
 @item --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.
+Do not force the use of encryption with a modification detection code.
+The default is to always use the MDC when encrypting.  If
+ at 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 e718fe4..4fc0874 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;

-----------------------------------------------------------------------


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org