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

[svn author dshaw]

Author: dshaw
Date: 2007-10-23 02:36:59 +0200 (Tue, 23 Oct 2007)
New Revision: 4601

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
* 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 "--enable-dsa2
--no-rfc2440-text --escape-from-lines".


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-10-22 19:07:56 UTC (rev 4600)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-10-23 00:36:59 UTC (rev 4601)
@@ -1,3 +1,10 @@
+2007-10-22  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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
+	"--enable-dsa2 --no-rfc2440-text --escape-from-lines".
+
 2007-10-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* misc.c (compliance_option_string, compliance_failure): Minor

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-10-22 19:07:56 UTC (rev 4600)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-10-23 00:36:59 UTC (rev 4601)
@@ -1810,8 +1810,8 @@
     opt.marginals_needed = 3;
     opt.max_cert_depth = 5;
     opt.pgp2_workarounds = 1;
-    opt.force_v3_sigs = 1;
     opt.escape_from = 1;
+    opt.flags.require_cross_cert = 1;
     opt.import_options=IMPORT_SK2PK;
     opt.export_options=EXPORT_ATTRIBUTES;
     opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
@@ -1825,7 +1825,6 @@
     opt.min_cert_level=2;
     set_screen_dimensions();
     opt.keyid_format=KF_SHORT;
-    opt.rfc2440_text=1;
     opt.def_sig_expire="0";
     opt.def_cert_expire="0";
     set_homedir ( default_homedir () );
@@ -2258,14 +2257,16 @@
 	    break;
 	  case oOpenPGP:
 	  case oRFC4880:
-	    /* Note these are the same defaults as CO_RFC2440.  Update
-	       this. */
+	    /* This is effectively the same as RFC2440, but with
+	       "--enable-dsa2 --no-rfc2440-text
+	       --escape-from-lines". */
 	    opt.compliance = CO_RFC4880;
-	    opt.rfc2440_text=1;
+	    opt.flags.dsa2 = 1;
+	    opt.rfc2440_text = 0;
 	    opt.allow_non_selfsigned_uid = 1;
 	    opt.allow_freeform_uid = 1;
 	    opt.pgp2_workarounds = 0;
-	    opt.escape_from = 0;
+	    opt.escape_from = 1;
 	    opt.force_v3_sigs = 0;
 	    opt.compress_keys = 0;	    /* not mandated, but we do it */
 	    opt.compress_sigs = 0;	    /* ditto. */
@@ -2279,10 +2280,9 @@
 	    opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
 	    break;
 	  case oRFC2440:
-	    /* TODO: When 2440bis becomes a RFC, set new values for
-	       oOpenPGP. */
 	    opt.compliance = CO_RFC2440;
-	    opt.rfc2440_text=1;
+	    opt.flags.dsa2 = 0;
+	    opt.rfc2440_text = 1;
 	    opt.allow_non_selfsigned_uid = 1;
 	    opt.allow_freeform_uid = 1;
 	    opt.pgp2_workarounds = 0;