[svn] GnuPG - r5103 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2009-07-31 16:34:55 +0200 (Fri, 31 Jul 2009)
New Revision: 5103

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
* gpg.c (main): --pgp6 includes --disable-mdc.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-07-30 16:45:06 UTC (rev 5102)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-07-31 14:34:55 UTC (rev 5103)
@@ -1,3 +1,7 @@
+2009-07-31  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.c (main): --pgp6 includes --disable-mdc.
+
 2009-07-29  Werner Koch  <wk at g10code.com>
 
 	* keygen.c (keygen_set_std_prefs): Remove RMD-160 from the list.

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2009-07-30 16:45:06 UTC (rev 5102)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2009-07-31 14:34:55 UTC (rev 5103)
@@ -3058,6 +3058,7 @@
       }
     else if(PGP6)
       {
+	opt.disable_mdc=1;
 	opt.escape_from=1;
 	opt.force_v3_sigs=1;
 	opt.ask_sig_expire=0;