[git] GnuPG - branch, dkg/fix-T3995, updated. gnupg-2.2.7-128-g3308d5e

[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, dkg/fix-T3995 has been updated
  discards  371b4bd2dd2d0501b48845dadeb4fd8ad37d5c86 (commit)
       via  3308d5e3f4e25dce5168c4a7cb2f545424c6d185 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (371b4bd2dd2d0501b48845dadeb4fd8ad37d5c86)
            \
             N -- N -- N (3308d5e3f4e25dce5168c4a7cb2f545424c6d185)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3308d5e3f4e25dce5168c4a7cb2f545424c6d185
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..6f804bd 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
+ at 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 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;

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

Summary of changes:
 doc/gpg.texi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


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