From 3f95e31e5df6bfcc0c0dd588e65243362242ae38 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Fri, 31 Jul 2009 14:34:55 +0000
Subject: * gpg.c (main): --pgp6 includes --disable-mdc.

---
 g10/ChangeLog | 4 ++++
 g10/gpg.c     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index b24d1177a..63d1a6315 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.c (main): --pgp6 includes --disable-mdc.
+
 2009-07-29  Werner Koch  <wk@g10code.com>
 
 	* keygen.c (keygen_set_std_prefs): Remove RMD-160 from the list.
diff --git a/g10/gpg.c b/g10/gpg.c
index 5e6283ac4..b704595fc 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3058,6 +3058,7 @@ main (int argc, char **argv )
       }
     else if(PGP6)
       {
+	opt.disable_mdc=1;
 	opt.escape_from=1;
 	opt.force_v3_sigs=1;
 	opt.ask_sig_expire=0;
-- 
cgit v1.2.3