[svn] GnuPG - r5178 - in branches/STABLE-BRANCH-2-0: . doc sm
svn author wk
cvs at cvs.gnupg.org
Fri Oct 16 12:56:59 CEST 2009
Author: wk
Date: 2009-10-16 12:56:59 +0200 (Fri, 16 Oct 2009)
New Revision: 5178
Modified:
branches/STABLE-BRANCH-2-0/NEWS
branches/STABLE-BRANCH-2-0/doc/gpgsm.texi
branches/STABLE-BRANCH-2-0/sm/ChangeLog
branches/STABLE-BRANCH-2-0/sm/gpgsm.c
Log:
Change default for --include-certs to -2.
Modified: branches/STABLE-BRANCH-2-0/sm/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/sm/ChangeLog 2009-10-15 17:20:41 UTC (rev 5177)
+++ branches/STABLE-BRANCH-2-0/sm/ChangeLog 2009-10-16 10:56:59 UTC (rev 5178)
@@ -1,3 +1,8 @@
+2009-10-16 Werner Koch <wk at g10code.com>
+
+ * gpgsm.c (DEFAULT_INCLUDE_CERTS): New.
+ (default_include_certs): Init to -2.
+
2009-08-06 Werner Koch <wk at g10code.com>
* sign.c (gpgsm_sign): Print INV_SNDR for a bad default key.
Modified: branches/STABLE-BRANCH-2-0/NEWS
===================================================================
--- branches/STABLE-BRANCH-2-0/NEWS 2009-10-15 17:20:41 UTC (rev 5177)
+++ branches/STABLE-BRANCH-2-0/NEWS 2009-10-16 10:56:59 UTC (rev 5178)
@@ -1,7 +1,10 @@
Noteworthy changes in version 2.0.14
-------------------------------------------------
+ * The default for --inlucde-cert is now to include all certificates
+ in the chain except for the root certificate.
+
Noteworthy changes in version 2.0.13 (2009-09-04)
-------------------------------------------------
Modified: branches/STABLE-BRANCH-2-0/doc/gpgsm.texi
===================================================================
--- branches/STABLE-BRANCH-2-0/doc/gpgsm.texi 2009-10-15 17:20:41 UTC (rev 5177)
+++ branches/STABLE-BRANCH-2-0/doc/gpgsm.texi 2009-10-16 10:56:59 UTC (rev 5178)
@@ -560,8 +560,8 @@
-1 includes all certs, 0 does not include any certs, 1 includes only
the signers cert (this is the default) and all other positive
values include up to @var{n} certificates starting with the signer cert.
+The default is -2.
-
@item --cipher-algo @var{oid}
@opindex cipher-algo
Use the cipher algorithm with the ASN.1 object identifier @var{oid} for
Modified: branches/STABLE-BRANCH-2-0/sm/gpgsm.c
===================================================================
--- branches/STABLE-BRANCH-2-0/sm/gpgsm.c 2009-10-15 17:20:41 UTC (rev 5177)
+++ branches/STABLE-BRANCH-2-0/sm/gpgsm.c 2009-10-16 10:56:59 UTC (rev 5178)
@@ -402,8 +402,11 @@
/* Option --enable-special-filenames */
static int allow_special_filenames;
-/* Default value for include-certs. */
-static int default_include_certs = 1; /* Only include the signer's cert. */
+/* Default value for include-certs. We need an extra macro for
+ gpgconf-list because the variable will be changed by the command
+ line option. */
+#define DEFAULT_INCLUDE_CERTS -2 /* Include all certs but root. */
+static int default_include_certs = DEFAULT_INCLUDE_CERTS;
/* Whether the chain mode shall be used for validation. */
static int default_validation_model;
@@ -1606,7 +1609,8 @@
printf ("disable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
printf ("disable-trusted-cert-crl-check:%lu:\n", GC_OPT_FLAG_NONE);
printf ("enable-ocsp:%lu:\n", GC_OPT_FLAG_NONE);
- printf ("include-certs:%lu:1:\n", GC_OPT_FLAG_DEFAULT);
+ printf ("include-certs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,
+ DEFAULT_INCLUDE_CERTS);
printf ("disable-policy-checks:%lu:\n", GC_OPT_FLAG_NONE);
printf ("auto-issuer-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
More information about the Gnupg-commits
mailing list