aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2009-07-31 14:34:55 +0000
committerDavid Shaw <[email protected]>2009-07-31 14:34:55 +0000
commit3f95e31e5df6bfcc0c0dd588e65243362242ae38 (patch)
treed9ac562a99efd77d50f7b5bc5a9bc7e0cbc48dd5
parentUpdate key generation menu to match gnupg 2.0. (diff)
downloadgnupg-3f95e31e5df6bfcc0c0dd588e65243362242ae38.tar.gz
gnupg-3f95e31e5df6bfcc0c0dd588e65243362242ae38.zip
* gpg.c (main): --pgp6 includes --disable-mdc.
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/gpg.c1
2 files changed, 5 insertions, 0 deletions
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 <[email protected]>
+
+ * gpg.c (main): --pgp6 includes --disable-mdc.
+
2009-07-29 Werner Koch <[email protected]>
* 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;