1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

Mainly changes to adjust for the changed KSBA API.

This commit is contained in:
Werner Koch 2003-11-12 15:17:44 +00:00
parent f794da4ad4
commit dba40e5e45
36 changed files with 217 additions and 246 deletions

View file

@ -27,9 +27,9 @@
#ifdef HAVE_OPENSC
#include <opensc/pkcs15.h>
#include <ksba.h>
#include "scdaemon.h"
#include <ksba.h>
#include "card-common.h"
@ -148,21 +148,20 @@ p15_enum_keypairs (CARD card, int idx,
return gpg_error (GPG_ERR_CARD);
}
cert = ksba_cert_new ();
if (!cert)
rc = ksba_cert_new (&cert);
if (rc)
{
gpg_error_t tmperr = out_of_core ();
sc_pkcs15_free_certificate (certder);
return tmperr;
return rc;
}
krc = ksba_cert_init_from_mem (cert, certder->data, certder->data_len);
sc_pkcs15_free_certificate (certder);
if (krc)
{
log_error ("failed to parse the certificate for private key %d: %s\n",
idx, ksba_strerror (krc));
idx, gpg_strerror (krc));
ksba_cert_release (cert);
return gpg_error (GPG_ERR_CARD);
return krc;
}
if (card_help_get_keygrip (cert, keygrip))
{