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

Merge pull request #635 from frankmorgner/sc-hsm 

minidriver: add logout function to avoid smart card reset

- closes #633 
- closes #634
This commit is contained in:
Frank Morgner 2015-12-14 20:38:34 +01:00
parent 5129c5a060 06f296b978
commit 3732ec2936
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libopensc/card-sc-hsm.c
View File

@ -192,6 +192,19 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
static int sc_hsm_logout(sc_card_t * card)
{
sc_path_t path;
sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
memset(priv->sopin, sizeof(priv->sopin), 0);
sc_path_set(&path, SC_PATH_TYPE_DF_NAME, sc_hsm_aid.value, sc_hsm_aid.len, 0, 0);
return sc_hsm_select_file(card, &path, NULL);
}
static int sc_hsm_read_binary(sc_card_t *card,
unsigned int idx, u8 *buf, size_t count,
unsigned long flags)
@ -1063,6 +1076,7 @@ static struct sc_card_driver * sc_get_driver(void)
sc_hsm_ops.finish = sc_hsm_finish;
sc_hsm_ops.card_ctl = sc_hsm_card_ctl;
sc_hsm_ops.pin_cmd = sc_hsm_pin_cmd;
sc_hsm_ops.logout = sc_hsm_logout;
/* no record oriented file services */
sc_hsm_ops.read_record = NULL;

1
src/libopensc/pkcs15-sc-hsm.c
View File

@ -588,6 +588,7 @@ static int sc_pkcs15emu_sc_hsm_add_prkd(sc_pkcs15_card_t * p15card, u8 keyid) {
key_info = (sc_pkcs15_prkey_info_t *)prkd.data;
key_info->key_reference = keyid;
key_info->path.aid.len = 0;
if (prkd.type == SC_PKCS15_TYPE_PRKEY_RSA) {
r = sc_pkcs15emu_add_rsa_prkey(p15card, &prkd, key_info);

22
src/minidriver/minidriver.c
View File

@ -3165,16 +3165,24 @@ DWORD WINAPI CardDeauthenticate(__in PCARD_DATA pCardData,
__in LPWSTR pwszUserId,
__in DWORD dwFlags)
{
VENDOR_SPECIFIC* vs = NULL;
int rv;
logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
logprintf(pCardData, 1, "CardDeauthenticate(%S) %d\n", NULLWSTR(pwszUserId), dwFlags);
if(!pCardData)
return SCARD_E_INVALID_PARAMETER;
/* TODO Reset PKCS#15 PIN object 'validated' flag */
vs = (VENDOR_SPECIFIC*)(pCardData->pvVendorSpecific);
sc_pkcs15_pincache_clear(vs->p15card);
rv = sc_logout(vs->p15card->card);
if (rv != SC_SUCCESS)
return SCARD_E_UNSUPPORTED_FEATURE;
/* force a reset of a card - SCARD_S_SUCCESS do not lead to the reset of the card and leave it still authenticated */
return SCARD_E_UNSUPPORTED_FEATURE;
return SCARD_S_SUCCESS;
}
DWORD WINAPI CardCreateDirectory(__in PCARD_DATA pCardData,
@ -4835,12 +4843,7 @@ DWORD WINAPI CardDeauthenticateEx(__in PCARD_DATA pCardData,
logprintf(pCardData, 1, "\nP:%d T:%d pCardData:%p ",GetCurrentProcessId(), GetCurrentThreadId(), pCardData);
logprintf(pCardData, 1, "CardDeauthenticateEx PinId=%d dwFlags=0x%08X\n",PinId, dwFlags);
if (!pCardData) return SCARD_E_INVALID_PARAMETER;
/* TODO Reset PKCS#15 PIN object 'validated' flag */
/* force a reset of a card - SCARD_S_SUCCESS does not lead to the reset of the card and leave it still authenticated */
return SCARD_E_UNSUPPORTED_FEATURE;
return CardDeauthenticate(pCardData, wszCARD_USER_USER, 0);
}
DWORD WINAPI CardGetContainerProperty(__in PCARD_DATA pCardData,
@ -5554,8 +5557,7 @@ DWORD WINAPI CardAcquireContext(__inout PCARD_DATA pCardData, __in DWORD dwFlags
pCardData->pfnCardAuthenticateChallenge = CardAuthenticateChallenge;
pCardData->pfnCardUnblockPin = CardUnblockPin;
pCardData->pfnCardChangeAuthenticator = CardChangeAuthenticator;
/* the minidriver does not perform a deauthentication - set it to NULL according to the specification */
pCardData->pfnCardDeauthenticate = NULL;
pCardData->pfnCardDeauthenticate = CardDeauthenticate;
pCardData->pfnCardCreateDirectory = CardCreateDirectory;
pCardData->pfnCardDeleteDirectory = CardDeleteDirectory;
pCardData->pvUnused3 = NULL;