summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2009-07-31 16:36:59 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2009-07-31 16:36:59 +0200
commitfcfcc611e711f33c6f5cc1fe66e461460a68a298 (patch)
treea98dcc2cd9a52500d66716ec6617510f9863dc5e
parent* gpg.texi (OpenPGP Options): Don't mention --no-sk-comment (doesn't (diff)
downloadgnupg2-fcfcc611e711f33c6f5cc1fe66e461460a68a298.tar.xz
gnupg2-fcfcc611e711f33c6f5cc1fe66e461460a68a298.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 0d008ca44..6e672871d 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-23 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_import_ldap): Try a DNS-SD lookup to find
diff --git a/g10/gpg.c b/g10/gpg.c
index 7f3163186..08c91106c 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3112,6 +3112,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;