From 960ac800487dbc9d91bbef005fee4ecbfae72e83 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 23 Oct 2007 03:00:21 +0000 Subject: [PATCH] * gpg.c (main): Add --require-cross-certification to --openpgp/--rfc4880 mode. --- g10/ChangeLog | 3 +++ g10/gpg.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index ac5221ad6..433b609cc 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2007-10-22 David Shaw + * gpg.c (main): Add --require-cross-certification to + --openpgp/--rfc4880 mode. + * gpg.c (main): Disable --rfc2440-text and --force-v3-sigs by default. Enable --require-cross-certification by default. --openpgp (--rfc4880) is the same as --rfc2440 except with diff --git a/g10/gpg.c b/g10/gpg.c index fbfd756a0..8a265d632 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -2258,10 +2258,11 @@ main (int argc, char **argv ) case oOpenPGP: case oRFC4880: /* This is effectively the same as RFC2440, but with - "--enable-dsa2 --no-rfc2440-text - --escape-from-lines". */ + "--enable-dsa2 --no-rfc2440-text --escape-from-lines + --require-cross-certification". */ opt.compliance = CO_RFC4880; opt.flags.dsa2 = 1; + opt.flags.require_cross_cert = 1; opt.rfc2440_text = 0; opt.allow_non_selfsigned_uid = 1; opt.allow_freeform_uid = 1;