mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* configure.ac: Require libksba 0.9.3 due to another bug fix there.
* sign.c (add_certificate_list): Decrement N for the first cert. * Makefile.am (sbin_SCRIPTS): New, to install addgnupghome. (EXTRA_DIST): Added rfc822parse.c rfc822parse.h gpgparsemail.c which might be useful for debugging.
This commit is contained in:
parent
a7840b9643
commit
fec4dc4c99
8 changed files with 38 additions and 6 deletions
|
@ -244,6 +244,7 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
|
|||
ksba_cert_ref (cert);
|
||||
|
||||
n = ctrl->include_certs;
|
||||
log_debug ("adding certificates at level %d\n", n);
|
||||
if (n == -2)
|
||||
{
|
||||
not_root = 1;
|
||||
|
@ -252,6 +253,8 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
|
|||
if (n < 0 || n > 50)
|
||||
n = 50; /* We better apply an upper bound */
|
||||
|
||||
/* First add my own certificate unless we don't want any certificate
|
||||
included at all. */
|
||||
if (n)
|
||||
{
|
||||
if (not_root && gpgsm_is_root_cert (cert))
|
||||
|
@ -260,7 +263,12 @@ add_certificate_list (CTRL ctrl, ksba_cms_t cms, ksba_cert_t cert)
|
|||
err = ksba_cms_add_cert (cms, cert);
|
||||
if (err)
|
||||
goto ksba_failure;
|
||||
if (n>0)
|
||||
n--;
|
||||
}
|
||||
/* Walk the chain to include all other certificates. Note that a -1
|
||||
used for N makes sure that there is no limit and all certs get
|
||||
included. */
|
||||
while ( n-- && !(rc = gpgsm_walk_cert_chain (cert, &next)) )
|
||||
{
|
||||
if (not_root && gpgsm_is_root_cert (next))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue