giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make PUK reference available to card driver from PKCS #15 layer for PIN 

unblock operations. This helps some of the card drivers which otherwise
would have a hard time locating the PUK for a PIN.
This commit is contained in:
Zoltan Kelemen 2020-07-02 10:26:13 +02:00 committed by Frank Morgner
parent bf30d64cf9
commit 929717b505
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libopensc/opensc.h
View File

@ -460,6 +460,7 @@ struct sc_pin_cmd_data {
unsigned int pin_type; /* usually SC_AC_CHV */
int pin_reference;
int puk_reference; /* non-zero means that reference is available */
struct sc_pin_cmd_pin pin1, pin2;

3
src/libopensc/pkcs15-pin.c
View File

@ -581,6 +581,7 @@ int sc_pkcs15_unblock_pin(struct sc_pkcs15_card *p15card,
struct sc_pin_cmd_data data;
struct sc_pkcs15_object *puk_obj;
struct sc_pkcs15_auth_info *puk_info = NULL;
int pukref = 0;
struct sc_pkcs15_auth_info *auth_info = (struct sc_pkcs15_auth_info *)pin_obj->data;
struct sc_card *card = p15card->card;
int r;
@ -602,6 +603,7 @@ int sc_pkcs15_unblock_pin(struct sc_pkcs15_card *p15card,
if (r >= 0 && puk_obj) {
/* second step: get the pkcs15 info object of the puk */
puk_info = (struct sc_pkcs15_auth_info *)puk_obj->data;
pukref = puk_info->attrs.pin.reference;
}
if (!puk_info) {
@ -627,6 +629,7 @@ int sc_pkcs15_unblock_pin(struct sc_pkcs15_card *p15card,
data.cmd = SC_PIN_CMD_UNBLOCK;
data.pin_type = SC_AC_CHV;
data.pin_reference = auth_info->attrs.pin.reference;
data.puk_reference = pukref;
data.pin1.data = puk;
data.pin1.len = puklen;
data.pin1.pad_char = auth_info->attrs.pin.pad_char;