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

CTX: detect card resets

This commit is contained in:
Frank Morgner 2017-10-09 17:59:50 +02:00
parent b4072af26e
commit ad6515ba55
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libopensc/reader-cryptotokenkit.m
View File

@ -155,9 +155,13 @@ static int cryptotokenkit_connect(sc_reader_t *reader)
priv->tksmartcard = [priv->tksmartcardslot makeSmartCard];
}
if (!priv->tksmartcard || ![priv->tksmartcard valid])
if (!priv->tksmartcard || !priv->tksmartcard.valid)
return SC_ERROR_CARD_NOT_PRESENT;
/* if tksmartcard.context is set to nil, we know that the card has been
* reset or aquired by a different session */
priv->tksmartcard.context = @(YES);
/* attempt to detect protocol in use T0/T1/RAW */
ctk_set_proto(reader);
@ -185,6 +189,12 @@ static int cryptotokenkit_lock(sc_reader_t *reader)
if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE)
goto err;
if (priv->tksmartcard.context == nil) {
r = SC_ERROR_CARD_RESET;
priv->tksmartcard.context = @(YES);
goto err;
}
[priv->tksmartcard beginSessionWithReply:^(BOOL success, NSError *error) {
if (success != TRUE) {
NSLog(@"Error locking card <%@>", error);