security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Replaced deprecated type names.

Browse Source 
* card-p15.c (p15_enum_keypairs): Replaced KRC by RC.
* card-dinsig.c (dinsig_enum_keypairs): Ditto.
This commit is contained in:
Werner Koch 2003-12-17 12:27:51 +00:00
parent e4cea09fe1
commit c4182e3e24
7 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-17 Werner Koch <wk@gnupg.org>
* card-p15.c (p15_enum_keypairs): Replaced KRC by RC.
* card-dinsig.c (dinsig_enum_keypairs): Ditto.
2003-12-16 Werner Koch <wk@gnupg.org>
* scdaemon.c (main): Set the prefixes for assuan logging.

2
scd/card-common.h
View File

@ -60,7 +60,7 @@ struct card_ctx_s {
/*-- card.c --*/
gpg_error_t map_sc_err (int rc);
int card_help_get_keygrip (KsbaCert cert, unsigned char *array);
int card_help_get_keygrip (ksba_cert_t cert, unsigned char *array);
/*-- card-15.c --*/
void p15_release_private_data (CARD card);

11
scd/card-dinsig.c
View File

@ -99,8 +99,7 @@ dinsig_enum_keypairs (CARD card, int idx,
int rc;
unsigned char *buf;
size_t buflen;
KsbaError krc;
KsbaCert cert;
ksba_cert_t cert;
/* fixme: We should locate the application via the EF(DIR) and not
assume a Netkey card */
@ -120,14 +119,14 @@ dinsig_enum_keypairs (CARD card, int idx,
return rc;
}
krc = ksba_cert_init_from_mem (cert, buf, buflen);
rc = ksba_cert_init_from_mem (cert, buf, buflen);
xfree (buf);
if (krc)
if (rc)
{
log_error ("failed to parse the certificate at idx %d: %s\n",
idx, gpg_strerror (krc));
idx, gpg_strerror (rc));
ksba_cert_release (cert);
return krc;
return rc;
}
if (card_help_get_keygrip (cert, keygrip))
{

11
scd/card-p15.c
View File

@ -109,14 +109,13 @@ p15_enum_keypairs (CARD card, int idx,
unsigned char *keygrip, char **keyid)
{
int rc;
KsbaError krc;
struct p15private_s *priv;
struct sc_pkcs15_object *tmpobj;
int nobjs;
struct sc_pkcs15_prkey_info *pinfo;
struct sc_pkcs15_cert_info *certinfo;
struct sc_pkcs15_cert *certder;
KsbaCert cert;
ksba_cert_t cert;
rc = init_private_data (card);
if (rc)
@ -154,14 +153,14 @@ p15_enum_keypairs (CARD card, int idx,
sc_pkcs15_free_certificate (certder);
return rc;
}
krc = ksba_cert_init_from_mem (cert, certder->data, certder->data_len);
rc = ksba_cert_init_from_mem (cert, certder->data, certder->data_len);
sc_pkcs15_free_certificate (certder);
if (krc)
if (rc)
{
log_error ("failed to parse the certificate for private key %d: %s\n",
idx, gpg_strerror (krc));
idx, gpg_strerror (rc));
ksba_cert_release (cert);
return krc;
return rc;
}
if (card_help_get_keygrip (cert, keygrip))
{

4
scd/card.c
View File

@ -58,11 +58,11 @@ map_sc_err (int rc)
/* Get the keygrip from CERT, return 0 on success */
int
card_help_get_keygrip (KsbaCert cert, unsigned char *array)
card_help_get_keygrip (ksba_cert_t cert, unsigned char *array)
{
gcry_sexp_t s_pkey;
int rc;
KsbaSexp p;
ksba_sexp_t p;
size_t n;
p = ksba_cert_get_public_key (cert);

2
scd/ccid-driver.c
View File

@ -133,7 +133,7 @@
/* Define to print information pertaining the T=1 protocol. */
#undef DEBUG_T1 1
#undef DEBUG_T1

4
scd/command.c
View File

@ -437,8 +437,8 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
int rc;
unsigned char *cert = NULL;
size_t ncert, n;
KsbaCert kc = NULL;
KsbaSexp p;
ksba_cert_t kc = NULL;
ksba_sexp_t p;
if ((rc = open_card (ctrl)))
return rc;