summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--scard-opensc.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b8a2467ed..ee5624fec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
2 - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from 2 - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
3 simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) 3 simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
4 - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. 4 - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt.
5 ok markus@ 5 Patch from larsch@trustcenter.de; ok markus@
6 - (djm) Bug #584: scard-opensc.c doesn't work without PIN. Patch from
7 larsch@trustcenter.de; ok markus@
6 8
720030603 920030603
8 - (djm) Replace setproctitle replacement with code derived from 10 - (djm) Replace setproctitle replacement with code derived from
@@ -431,4 +433,4 @@
431 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 433 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
432 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 434 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
433 435
434$Id: ChangeLog,v 1.2772 2003/06/04 09:15:10 djm Exp $ 436$Id: ChangeLog,v 1.2773 2003/06/04 09:22:06 djm Exp $
diff --git a/scard-opensc.c b/scard-opensc.c
index 312251829..2055ee22a 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -133,7 +133,11 @@ sc_prkey_op_init(RSA *rsa, struct sc_pkcs15_object **key_obj_out)
133 key = key_obj->data; 133 key = key_obj->data;
134 r = sc_pkcs15_find_pin_by_auth_id(p15card, &key_obj->auth_id, 134 r = sc_pkcs15_find_pin_by_auth_id(p15card, &key_obj->auth_id,
135 &pin_obj); 135 &pin_obj);
136 if (r) { 136 if (r == SC_ERROR_OBJECT_NOT_FOUND) {
137 /* no pin required */
138 *key_obj_out = key_obj;
139 return 0;
140 } else if (r) {
137 error("Unable to find PIN object from SmartCard: %s", 141 error("Unable to find PIN object from SmartCard: %s",
138 sc_strerror(r)); 142 sc_strerror(r));
139 goto err; 143 goto err;