[svn] GnuPG - r4602 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-10-23 05:00:21 +0200 (Tue, 23 Oct 2007)
New Revision: 4602

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
* gpg.c (main): Add --require-cross-certification to
--openpgp/--rfc4880 mode.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-10-23 00:36:59 UTC (rev 4601)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-10-23 03:00:21 UTC (rev 4602)
@@ -1,5 +1,8 @@
 2007-10-22  David Shaw  <dshaw at jabberwocky.com>
 
+	* 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

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-10-23 00:36:59 UTC (rev 4601)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-10-23 03:00:21 UTC (rev 4602)
@@ -2258,10 +2258,11 @@
 	  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;