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

pkcs11: with 'init-pin-in-SO-session' PIN unblock style, try to set PIN when PUK value is not available 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5539 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
vtarasov 2011-06-02 18:05:02 +00:00
parent 36a85ffe5b
commit 35bd07ed5e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkcs11/framework-pkcs15.c
View File

@ -1320,24 +1320,23 @@ static CK_RV pkcs15_init_pin(struct sc_pkcs11_card *p11card,
struct sc_pkcs15_pin_info *pin_info; struct sc_pkcs15_pin_info *pin_info;
int rc; int rc;
sc_debug(context, SC_LOG_DEBUG_NORMAL, "pkcs15 init PIN: pin %p:%d\n", pPin, ulPinLen); sc_debug(context, SC_LOG_DEBUG_NORMAL, "pkcs15 init PIN: pin %p:%d; unblock style %i",
pPin, ulPinLen, sc_pkcs11_conf.pin_unblock_style);
pin_info = slot_data_pin_info(slot->fw_data); pin_info = slot_data_pin_info(slot->fw_data);
if (pin_info && sc_pkcs11_conf.pin_unblock_style == SC_PKCS11_PIN_UNBLOCK_SO_LOGGED_INITPIN) { if (pin_info && sc_pkcs11_conf.pin_unblock_style == SC_PKCS11_PIN_UNBLOCK_SO_LOGGED_INITPIN) {
/* C_InitPIN is used to unblock User PIN or set it in the SO session .*/
auth_obj = slot_data_auth(slot->fw_data); auth_obj = slot_data_auth(slot->fw_data);
if (fw_data->user_puk_len) { if (fw_data->user_puk_len) {
rc = sc_pkcs15_unblock_pin(fw_data->p15_card, auth_obj, rc = sc_pkcs15_unblock_pin(fw_data->p15_card, auth_obj,
fw_data->user_puk, fw_data->user_puk_len, pPin, ulPinLen); fw_data->user_puk, fw_data->user_puk_len, pPin, ulPinLen);
} }
else { else {
#if 0 /* FIXME (VT): Actually sc_pkcs15_unblock_pin() do not accepts zero length PUK.
/* TODO: Actually sc_pkcs15_unblock_pin() do not accepts zero length value as a PUK argument. * Something like sc_pkcs15_set_pin() should be introduced.
* It's usefull for the cards that do not supports modes 00 and 01 * For a while, use the 'libopensc' API to set PIN. */
* of ISO 'RESET RETRY COUNTER' command. */ rc = sc_reset_retry_counter(fw_data->p15_card->card, SC_AC_CHV, pin_info->reference,
rc = sc_pkcs15_unblock_pin(fw_data->p15_card, auth_obj, NULL, 0, pPin, ulPinLen); NULL, 0, pPin, ulPinLen);
#else
return sc_to_cryptoki_error(SC_ERROR_NOT_SUPPORTED, "C_InitPIN");
#endif
} }
return sc_to_cryptoki_error(rc, "C_InitPIN"); return sc_to_cryptoki_error(rc, "C_InitPIN");