RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

larsch@trustcenter.de; ok markus@
This commit is contained in:
Damien Miller 2003-06-04 19:22:06 +10:00
parent 485397c48d
commit 2527f5755a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -2,7 +2,9 @@
- (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from - (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) 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. - (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 20030603
- (djm) Replace setproctitle replacement with code derived from - (djm) Replace setproctitle replacement with code derived from
@ -431,4 +433,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2772 2003/06/04 09:15:10 djm Exp $ $Id: ChangeLog,v 1.2773 2003/06/04 09:22:06 djm Exp $

6
scard-opensc.c
View File

@ -133,7 +133,11 @@ sc_prkey_op_init(RSA *rsa, struct sc_pkcs15_object **key_obj_out)
key = key_obj->data; key = key_obj->data;
r = sc_pkcs15_find_pin_by_auth_id(p15card, &key_obj->auth_id, r = sc_pkcs15_find_pin_by_auth_id(p15card, &key_obj->auth_id,
&pin_obj); &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", error("Unable to find PIN object from SmartCard: %s",
sc_strerror(r)); sc_strerror(r));
goto err; goto err;