- (djm) Bug #584: scard-opensc.c doesn't work without PIN. Patch from

   larsch@trustcenter.de; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 4a9ea2fca65383aea5f985dcd7d05039d3e0b23c..205a182f256ee8083c5742973882d705c7138691 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
  - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
    simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
  - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. 
-   ok markus@
+   Patch from larsch@trustcenter.de; ok markus@
+ - (djm) Bug #584: scard-opensc.c doesn't work without PIN. Patch from 
+   larsch@trustcenter.de; ok markus@
 
 20030603
  - (djm) Replace setproctitle replacement with code derived from 

diff --git a/scard-opensc.c b/scard-opensc.c
index 312251829f18965e9c8645408365585477c08e1c..2055ee22ae5ad8183da4e080c309d9df00fed651 100644 (file)
--- 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)
        key = key_obj->data;
        r = sc_pkcs15_find_pin_by_auth_id(p15card, &key_obj->auth_id,
                                          &pin_obj);
-       if (r) {
+       if (r == SC_ERROR_OBJECT_NOT_FOUND) {
+               /* no pin required */
+               *key_obj_out = key_obj;
+               return 0;
+       } else if (r) {
                error("Unable to find PIN object from SmartCard: %s",
                      sc_strerror(r));
                goto err;