diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 22:12:17 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 22:12:17 +1000 |
commit | 4c322482bbf1a7465c5ef1b1e280c09d39c8bb2e (patch) | |
tree | eea212a16baec2d433aa1eed77612967584e5ec4 | |
parent | 31b3a0a98f520dede4e218898eed3cf9d415c903 (diff) |
- (djm) Update to fix of bug #584: lock card before return.
From larsch@trustcenter.de
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scard-opensc.c | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -14,6 +14,8 @@ | |||
14 | - djm@cvs.openbsd.org 2003/06/04 10:23:48 | 14 | - djm@cvs.openbsd.org 2003/06/04 10:23:48 |
15 | [sshd.c] | 15 | [sshd.c] |
16 | remove duplicated group-dropping code; ok markus@ | 16 | remove duplicated group-dropping code; ok markus@ |
17 | - (djm) Update to fix of bug #584: lock card before return. | ||
18 | From larsch@trustcenter.de | ||
17 | 19 | ||
18 | 20030603 | 20 | 20030603 |
19 | - (djm) Replace setproctitle replacement with code derived from | 21 | - (djm) Replace setproctitle replacement with code derived from |
@@ -442,4 +444,4 @@ | |||
442 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 444 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
443 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 445 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
444 | 446 | ||
445 | $Id: ChangeLog,v 1.2775 2003/06/04 10:32:12 djm Exp $ | 447 | $Id: ChangeLog,v 1.2776 2003/06/04 12:12:17 djm Exp $ |
diff --git a/scard-opensc.c b/scard-opensc.c index 2055ee22a..c670428a1 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -135,6 +135,7 @@ sc_prkey_op_init(RSA *rsa, struct sc_pkcs15_object **key_obj_out) | |||
135 | &pin_obj); | 135 | &pin_obj); |
136 | if (r == SC_ERROR_OBJECT_NOT_FOUND) { | 136 | if (r == SC_ERROR_OBJECT_NOT_FOUND) { |
137 | /* no pin required */ | 137 | /* no pin required */ |
138 | sc_lock(card); | ||
138 | *key_obj_out = key_obj; | 139 | *key_obj_out = key_obj; |
139 | return 0; | 140 | return 0; |
140 | } else if (r) { | 141 | } else if (r) { |