CACKey: Check-in [93bc06dab6]

Overview

Comment:	Fixed retry on NOT_TRANSACTED to retry at a higher level Consolidated all SCardReconnect calls into a wrapper that takes care of T=0 or T=1 selection
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	93bc06dab6eec10a99dacf3af520ba4edd5c0521
User & Date:	rkeene on 2010-07-23 17:24:42
Other Links:	manifest \| tags

Context

2010-07-23
21:23		Added timing information to debug output Fixed issue where readers that were removed and readded weren't connected to properly check-in: e4fd58cbb9 user: rkeene tags: trunk
17:24		Fixed retry on NOT_TRANSACTED to retry at a higher level Consolidated all SCardReconnect calls into a wrapper that takes care of T=0 or T=1 selection check-in: 93bc06dab6 user: rkeene tags: trunk
09:08		Fixed bug with selecting between T=0 and T=1 protocol and card going to sleep Fixed bug with soft-transactions Updated soft-transactions to re-lock hardware card if possible check-in: 9b04a062cc user: rkeene tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified cackey.c from [4c31fc86bf] to [5f33c366a8].

︙
571 572 573 574 575 576 577 ~~578~~ 579 580 581 582 583 584 585	571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586	- + +	typedef enum { CACKEY_PCSC_S_TOKENPRESENT = 1, CACKEY_PCSC_S_OK = 0, CACKEY_PCSC_E_GENERIC = -1, CACKEY_PCSC_E_BADPIN = -2, CACKEY_PCSC_E_LOCKED = -3, CACKEY_PCSC_E_NEEDLOGIN = -4, ~~CACKEY_PCSC_E_TOKENABSENT = -6~~ CACKEY_PCSC_E_TOKENABSENT = -6, CACKEY_PCSC_E_RETRY = -7 } cackey_ret; struct cackey_tlv_cardurl { unsigned char rid[5]; cackey_tlv_apptype apptype; cackey_tlv_objectid objectid; cackey_tlv_objectid appid;
︙
806 807 808 809 810 811 812 813 814 815 816 817 818 819	807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	if (scard_rel_context_ret != SCARD_S_SUCCESS) { return(CACKEY_PCSC_E_GENERIC); } return(CACKEY_PCSC_S_OK); } /* * SYNPOSIS * LONG cackey_reconnect_card(struct cackey_slot slot, DWORD default_protocol, LPDWORD selected_protocol); * ARGUMENTS * cackey_slot slot Slot to send commands to * * DWORD default_protocol * Protocol to attempt first * * LPDWORD selected_protocol * [OUT] Protocol selected * * RETURN VALUE * The return value from SCardReconnect() * * NOTES * This function is a wrapper around SCardReconnect() * * The SCardReconnect() function call will be called first with the * dwPreferredProtocols of "default_protocol". If that call returns * SCARD_E_PROTO_MISMATCH try again with a protocol of T=0, and failing * that T=1. * / static LONG cackey_reconnect_card(struct cackey_slot slot, DWORD default_protocol, LPDWORD selected_protocol) { LONG scard_conn_ret; scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, default_protocol, SCARD_RESET_CARD, selected_protocol); if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) { CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=0") scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, selected_protocol); if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) { CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=1") scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T1, SCARD_RESET_CARD, selected_protocol); } } return(scard_conn_ret); } /* * SYNPOSIS * cackey_ret cackey_connect_card(struct cackey_slot slot); * ARGUMENTS * cackey_slot *slot
︙
875 876 877 878 879 880 881 ~~882 883~~ ~~884 885 886 887 888 889 890 891 892 893~~ 894 895 896 897 898 899 900	920 921 922 923 924 925 926 927 928 929 930 931 932 933 934	- - + - - - - - - - - - -	if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) { CACKEY_DEBUG_PRINTF("SCardConnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=1") scard_conn_ret = SCardConnect(*cackey_pcsc_handle, slot->pcsc_reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T1, &slot->pcsc_card, &protocol); } } ~~scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, protocol, SCARD_RESET_CARD, &protocol);~~ scard_conn_ret = cackey_reconnect_card(slot, protocol, &protocol); ~~if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) {~~ ~~CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=0")~~ ~~scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, &protocol);~~ ~~if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) {~~ ~~CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=1")~~ ~~scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T1, SCARD_RESET_CARD, &protocol);~~ } } } if (scard_conn_ret != SCARD_S_SUCCESS) { CACKEY_DEBUG_PRINTF("Connection to card failed, returning in failure (SCardConnect() = %s/%li)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_conn_ret), (long) scard_conn_ret); return(CACKEY_PCSC_E_GENERIC); }
︙
1096 1097 1098 1099 1100 1101 1102 ~~1103~~ 1104 1105 1106 1107 1108 1109 1110	1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144	- +	size_t bytes_to_copy, tmp_respdata_len; LPCSCARD_IO_REQUEST pioSendPci; DWORD protocol; DWORD xmit_len, recv_len; LONG scard_xmit_ret, scard_reconn_ret; BYTE xmit_buf[1024], recv_buf[1024]; int pcsc_connect_ret, pcsc_getresp_ret; ~~int idx~~, retry~~;~~ int idx; CACKEY_DEBUG_PRINTF("Called."); if (!slot) { CACKEY_DEBUG_PRINTF("Invalid slot specified."); return(CACKEY_PCSC_E_GENERIC);
︙
1156 1157 1158 1159 1160 1161 1162 ~~1163 1164 1165~~ 1166 ~~1167 1168 1169~~ ~~1170 1171~~ 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 ~~1183~~ 1184 1185 1186 1187 1188 1189 1190	1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225	- - - + - - - + + + - - + + + + - + +	if (class == GSCIS_CLASS_ISO7816 && instruction == GSCIS_INSTR_VERIFY && p1 == 0x00 && p2 == 0x00) { CACKEY_DEBUG_PRINTF("Sending APDU: <<censored>>"); } else { CACKEY_DEBUG_PRINTBUF("Sending APDU:", xmit_buf, xmit_len); } recv_len = sizeof(recv_buf); ~~for (retry = 0; retry < 10; retry++) {~~ ~~CACKEY_DEBUG_PRINTF("Calling SCardTransmit()");~~ scard_xmit_ret = SCardTransmit(slot->pcsc_card, pioSendPci, xmit_buf, xmit_len, NULL, recv_buf, &recv_len); scard_xmit_ret = SCardTransmit(slot->pcsc_card, pioSendPci, xmit_buf, xmit_len, NULL, recv_buf, &recv_len); if (scard_xmit_ret == SCARD_E_NOT_TRANSACTED) { CACKEY_DEBUG_PRINTF("Failed to send APDU to card (SCardTransmit() = %s/%lx), will retry...", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (unsigned long) scard_xmit_ret); ~~} else {~~ if (scard_xmit_ret == SCARD_E_NOT_TRANSACTED) { CACKEY_DEBUG_PRINTF("Failed to send APDU to card (SCardTransmit() = %s/%lx), will ask calling function to retry...", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (unsigned long) scard_xmit_ret); ~~~~break;~~ }~~ /* Begin Smartcard Transaction / cackey_end_transaction(slot); return(CACKEY_PCSC_E_RETRY); } if (scard_xmit_ret != SCARD_S_SUCCESS) { CACKEY_DEBUG_PRINTF("Failed to send APDU to card (SCardTransmit() = %s/%lx)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (unsigned long) scard_xmit_ret); CACKEY_DEBUG_PRINTF("Marking slot as having been reset"); slot->slot_reset = 1; if (scard_xmit_ret == SCARD_W_RESET_CARD) { CACKEY_DEBUG_PRINTF("Reset required, please hold..."); ~~scard_reconn_ret = SCa~~rdR~~econnect(slot~~->pcsc_card, SCARD_SHARE_SHARED~~, SCARD_PROTOCOL_T0 \| SCARD_PROTOCOL_T1~~, SCARD_RESET_CARD~~, &protocol);~~ scard_reconn_ret = cackey_reconnect_card(slot, SCARD_PROTOCOL_T0 \| SCARD_PROTOCOL_T1, &protocol); if (scard_reconn_ret == SCARD_S_SUCCESS) { / Update protocol */ slot->protocol = protocol; switch (slot->protocol) { case SCARD_PROTOCOL_T0: pioSendPci = SCARD_PCI_T0;
︙
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320	1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360	+ + + + +	CACKEY_DEBUG_PRINTF("Buffer read required"); if (minor_rc == 0x00) { minor_rc = CACKEY_APDU_MTU; } pcsc_getresp_ret = cackey_send_apdu(slot, GSCIS_CLASS_ISO7816, GSCIS_INSTR_GET_RESPONSE, 0x00, 0x00, 0, NULL, minor_rc, respcode, respdata, &tmp_respdata_len); if (pcsc_getresp_ret != CACKEY_PCSC_S_OK) { CACKEY_DEBUG_PRINTF("Buffer read failed! Returning in failure"); /* End Smartcard Transaction / cackey_end_transaction(slot); if (pcsc_getresp_ret == CACKEY_PCSC_E_RETRY) { return(CACKEY_PCSC_E_RETRY); } return(CACKEY_PCSC_E_GENERIC); } if (respdata_len) { respdata_len += tmp_respdata_len; }
︙
1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387	1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435	+ + + + + + + +	* This function returns the number of bytes actually read, or -1 on error. * * NOTES * None * / static ssize_t cackey_read_buffer(struct cackey_slot slot, unsigned char buffer, size_t count, unsigned char t_or_v, size_t initial_offset) { unsigned char init_buffer; size_t init_count; size_t init_initial_offset; size_t offset = 0, max_offset, max_count; unsigned char cmd[2]; uint16_t respcode; int send_ret; CACKEY_DEBUG_PRINTF("Called."); init_buffer = buffer; init_count = count; init_initial_offset = initial_offset; max_offset = count; max_count = CACKEY_APDU_MTU; if (t_or_v != 1 && t_or_v != 2) { CACKEY_DEBUG_PRINTF("Invalid T or V parameter specified, returning in failure"); return(-1);
︙
1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413	1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468	+ + + + + + +	if (count > max_count) { count = max_count; } cmd[1] = count; send_ret = cackey_send_apdu(slot, GSCIS_CLASS_GLOBAL_PLATFORM, GSCIS_INSTR_READ_BUFFER, ((initial_offset + offset) >> 8) & 0xff, (initial_offset + offset) & 0xff, sizeof(cmd), cmd, 0x00, &respcode, buffer + offset, &count); if (send_ret == CACKEY_PCSC_E_RETRY) { CACKEY_DEBUG_PRINTF("ADPU Sending failed, retrying read buffer"); return(cackey_read_buffer(slot, init_buffer, init_count, t_or_v, init_initial_offset)); } if (send_ret != CACKEY_PCSC_S_OK) { if (respcode == 0x6A86) { if (max_count == 1) { break; } max_count = max_count / 2;
︙
1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483	1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545	+ + + + + + +	int send_ret; CACKEY_DEBUG_PRINTF("Called."); CACKEY_DEBUG_PRINTBUF("Selecting applet:", aid, aid_len); send_ret = cackey_send_apdu(slot, GSCIS_CLASS_ISO7816, GSCIS_INSTR_SELECT, GSCIS_PARAM_SELECT_APPLET, 0x00, aid_len, aid, 0x00, NULL, NULL, NULL); if (send_ret == CACKEY_PCSC_E_RETRY) { CACKEY_DEBUG_PRINTF("ADPU Sending failed, retrying select applet"); return(cackey_select_applet(slot, aid, aid_len)); } if (send_ret != CACKEY_PCSC_S_OK) { CACKEY_DEBUG_PRINTF("Failed to open applet, returning in failure"); return(CACKEY_PCSC_E_GENERIC); } CACKEY_DEBUG_PRINTF("Successfully selected file");
︙
2331 2332 2333 2334 2335 2336 2337 ~~2338~~ 2339 2340 2341 2342 2343 2344 2345	2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407	- +	if (status_ret != SCARD_S_SUCCESS) { slot->slot_reset = 1; slot->token_flags = CKF_LOGIN_REQUIRED; if (status_ret == SCARD_W_RESET_CARD) { CACKEY_DEBUG_PRINTF("Reset required, please hold..."); ~~scard_reconn_ret = SCa~~rdR~~econnect(slot~~->pcsc_card, SCARD_SHARE_SHARED~~, SCARD_PROTOCOL_T0 \| SCARD_PROTOCOL_T1~~, SCARD_RESET_CARD~~, &protocol);~~ scard_reconn_ret = cackey_reconnect_card(slot, SCARD_PROTOCOL_T0 \| SCARD_PROTOCOL_T1, &protocol); if (scard_reconn_ret == SCARD_S_SUCCESS) { /* Update protocol / slot->protocol = protocol; / Re-establish transaction, if it was present */ if (slot->transaction_depth > 0) { slot->transaction_depth--;
︙