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

Mainly changes to adjust for the changed KSBA API.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
scd/ChangeLog
View file

@ -1,3 +1,7 @@
2003-11-12 Werner Koch <wk@gnupg.org>
Adjusted for API changes in Libksba.
2003-10-30 Werner Koch <wk@gnupg.org>
* apdu.c (close_ct_reader, close_pcsc_reader): Implemented.

13
scd/card-dinsig.c
View file

@ -79,9 +79,9 @@
#ifdef HAVE_OPENSC
#include <opensc/pkcs15.h>
#include "scdaemon.h"
#include <ksba.h>
#include "scdaemon.h"
#include "card-common.h"
static int dinsig_read_cert (CARD card, const char *certidstr,
@ -113,12 +113,11 @@ dinsig_enum_keypairs (CARD card, int idx,
if (rc)
return rc;
cert = ksba_cert_new ();
if (!cert)
rc = ksba_cert_new (&cert);
if (rc)
{
gpg_error_t tmperr = out_of_core ();
xfree (buf);
return tmperr;
return rc;
}
krc = ksba_cert_init_from_mem (cert, buf, buflen);
@ -126,9 +125,9 @@ dinsig_enum_keypairs (CARD card, int idx,
if (krc)
{
log_error ("failed to parse the certificate at idx %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))
{

13
scd/card-p15.c
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))
{

3
scd/card.c
View file

@ -28,9 +28,10 @@
#ifdef HAVE_OPENSC
#include <opensc/pkcs15.h>
#endif
#include <ksba.h>
#include "scdaemon.h"
#include <ksba.h>
#include "card-common.h"
/* Map the SC error codes to the GNUPG ones */

12
scd/command.c
View file

@ -25,11 +25,11 @@
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#include <ksba.h>
#include <assuan.h>
#include "scdaemon.h"
#include <ksba.h>
#include "app-common.h"
/* maximum length aloowed as a PIN; used for INQUIRE NEEDPIN */
@ -453,18 +453,16 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
goto leave;
}
kc = ksba_cert_new ();
if (!kc)
rc = ksba_cert_new (&kc);
if (rc)
{
rc = out_of_core ();
xfree (cert);
goto leave;
}
rc = ksba_cert_init_from_mem (kc, cert, ncert);
if (rc)
{
log_error ("failed to parse the certificate: %s\n", ksba_strerror (rc));
rc = map_ksba_err (rc);
log_error ("failed to parse the certificate: %s\n", gpg_strerror (rc));
goto leave;
}
@ -531,7 +529,7 @@ pin_cb (void *opaque, const char *info, char **retstr)
ASSUAN_CONTEXT ctx = opaque;
char *command;
int rc;
char *value;
unsigned char *value;
size_t valuelen;
*retstr = NULL;