diff options
Diffstat (limited to 'scard-opensc.c')
-rw-r--r-- | scard-opensc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scard-opensc.c b/scard-opensc.c index dd21de39a..e91bc25ba 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -321,7 +321,7 @@ sc_read_pubkey(Key * k, const struct sc_pkcs15_object *cert_obj) | |||
321 | debug("sc_read_pubkey() with cert id %02X", cinfo->id.value[0]); | 321 | debug("sc_read_pubkey() with cert id %02X", cinfo->id.value[0]); |
322 | r = sc_pkcs15_read_certificate(p15card, cinfo, &cert); | 322 | r = sc_pkcs15_read_certificate(p15card, cinfo, &cert); |
323 | if (r) { | 323 | if (r) { |
324 | log("Certificate read failed: %s", sc_strerror(r)); | 324 | logit("Certificate read failed: %s", sc_strerror(r)); |
325 | goto err; | 325 | goto err; |
326 | } | 326 | } |
327 | x509 = X509_new(); | 327 | x509 = X509_new(); |
@@ -331,7 +331,7 @@ sc_read_pubkey(Key * k, const struct sc_pkcs15_object *cert_obj) | |||
331 | } | 331 | } |
332 | p = cert->data; | 332 | p = cert->data; |
333 | if (!d2i_X509(&x509, &p, cert->data_len)) { | 333 | if (!d2i_X509(&x509, &p, cert->data_len)) { |
334 | log("Unable to parse X.509 certificate"); | 334 | logit("Unable to parse X.509 certificate"); |
335 | r = -1; | 335 | r = -1; |
336 | goto err; | 336 | goto err; |
337 | } | 337 | } |
@@ -341,7 +341,7 @@ sc_read_pubkey(Key * k, const struct sc_pkcs15_object *cert_obj) | |||
341 | X509_free(x509); | 341 | X509_free(x509); |
342 | x509 = NULL; | 342 | x509 = NULL; |
343 | if (pubkey->type != EVP_PKEY_RSA) { | 343 | if (pubkey->type != EVP_PKEY_RSA) { |
344 | log("Public key is of unknown type"); | 344 | logit("Public key is of unknown type"); |
345 | r = -1; | 345 | r = -1; |
346 | goto err; | 346 | goto err; |
347 | } | 347 | } |
@@ -413,7 +413,7 @@ sc_get_keys(const char *id, const char *pin) | |||
413 | r = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_CERT_X509, | 413 | r = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_CERT_X509, |
414 | certs, 32); | 414 | certs, 32); |
415 | if (r == 0) { | 415 | if (r == 0) { |
416 | log("No certificates found on smartcard"); | 416 | logit("No certificates found on smartcard"); |
417 | r = -1; | 417 | r = -1; |
418 | goto err; | 418 | goto err; |
419 | } else if (r < 0) { | 419 | } else if (r < 0) { |