security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

Change default for --include-certs to -2.

Browse Source
This commit is contained in:
Werner Koch 2009-10-16 10:56:59 +00:00
parent b676b720e7
commit 651b5eeda2
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,6 +1,9 @@
Noteworthy changes in version 2.0.14 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) Noteworthy changes in version 2.0.13 (2009-09-04)
------------------------------------------------- -------------------------------------------------

2
doc/gpgsm.texi
View File

@ -560,7 +560,7 @@ Using @var{n} of -2 includes all certificate except for the root cert,
-1 includes all certs, 0 does not include any certs, 1 includes only -1 includes all certs, 0 does not include any certs, 1 includes only
the signers cert (this is the default) and all other positive the signers cert (this is the default) and all other positive
values include up to @var{n} certificates starting with the signer cert. values include up to @var{n} certificates starting with the signer cert.
The default is -2.
@item --cipher-algo @var{oid} @item --cipher-algo @var{oid}
@opindex cipher-algo @opindex cipher-algo

5
sm/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-16 Werner Koch <wk@g10code.com>
* gpgsm.c (DEFAULT_INCLUDE_CERTS): New.
(default_include_certs): Init to -2.
2009-08-06 Werner Koch <wk@g10code.com> 2009-08-06 Werner Koch <wk@g10code.com>
* sign.c (gpgsm_sign): Print INV_SNDR for a bad default key. * sign.c (gpgsm_sign): Print INV_SNDR for a bad default key.

10
sm/gpgsm.c
View File

@ -402,8 +402,11 @@ static unsigned int debug_value;
/* Option --enable-special-filenames */ /* Option --enable-special-filenames */
static int allow_special_filenames; static int allow_special_filenames;
/* Default value for include-certs. */ /* Default value for include-certs. We need an extra macro for
static int default_include_certs = 1; /* Only include the signer's cert. */ 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. */ /* Whether the chain mode shall be used for validation. */
static int default_validation_model; static int default_validation_model;
@ -1606,7 +1609,8 @@ main ( int argc, char **argv)
printf ("disable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE); printf ("disable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
printf ("disable-trusted-cert-crl-check:%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 ("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 ("disable-policy-checks:%lu:\n", GC_OPT_FLAG_NONE);
printf ("auto-issuer-key-retrieve:%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); printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);