[svn] GnuPG - r5105 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2009-07-31 16:36:59 +0200 (Fri, 31 Jul 2009)
New Revision: 5105

Modified:
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
Log:
* gpg.c (main): --pgp6 includes --disable-mdc.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-07-31 14:36:22 UTC (rev 5104)
+++ trunk/g10/ChangeLog	2009-07-31 14:36:59 UTC (rev 5105)
@@ -1,3 +1,7 @@
+2009-07-31  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.c (main): --pgp6 includes --disable-mdc.
+
 2009-07-23  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyserver.c (keyserver_import_ldap): Try a DNS-SD lookup to find

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2009-07-31 14:36:22 UTC (rev 5104)
+++ trunk/g10/gpg.c	2009-07-31 14:36:59 UTC (rev 5105)
@@ -3112,6 +3112,7 @@
       }
     else if(PGP6)
       {
+	opt.disable_mdc=1;
 	opt.escape_from=1;
 	opt.force_v3_sigs=1;
 	opt.ask_sig_expire=0;