Overview
| Comment: | Updated transactional support to recursive transactions |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
43170e1dd99babbfe0a27ad35c71934d |
| User & Date: | rkeene on 2010-05-14 03:28:41 |
| Other Links: | manifest | tags |
Context
|
2010-05-14
| ||
| 03:32 | Updated transaction support check-in: c2e40da095 user: rkeene tags: trunk | |
| 03:28 | Updated transactional support to recursive transactions check-in: 43170e1dd9 user: rkeene tags: trunk | |
| 02:34 | Put all calls to functions that talk to the smartcard inside the big global mutex check-in: da2b17a36c user: rkeene tags: trunk | |
Changes
Modified cackey.c from [38178200a5] to [0fee951b43].
| ︙ | ︙ | |||
481 482 483 484 485 486 487 488 489 490 491 492 493 494 |
struct cackey_slot {
int active;
char *pcsc_reader;
int pcsc_card_connected;
SCARDHANDLE pcsc_card;
};
typedef enum {
CACKEY_TLV_APP_GENERIC = 0x01,
CACKEY_TLV_APP_SKI = 0x02,
CACKEY_TLV_APP_PKI = 0x04
} cackey_tlv_apptype;
| > > | 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 |
struct cackey_slot {
int active;
char *pcsc_reader;
int pcsc_card_connected;
SCARDHANDLE pcsc_card;
int transaction_depth;
};
typedef enum {
CACKEY_TLV_APP_GENERIC = 0x01,
CACKEY_TLV_APP_SKI = 0x02,
CACKEY_TLV_APP_PKI = 0x04
} cackey_tlv_apptype;
|
| ︙ | ︙ | |||
738 739 740 741 742 743 744 745 746 747 748 749 750 751 |
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);
}
slot->pcsc_card_connected = 1;
}
return(CACKEY_PCSC_S_OK);
}
/*
* SYNPOSIS
| > | 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 |
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);
}
slot->pcsc_card_connected = 1;
slot->transaction_depth = 0;
}
return(CACKEY_PCSC_S_OK);
}
/*
* SYNPOSIS
|
| ︙ | ︙ | |||
771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 |
cackey_conn_ret = cackey_connect_card(slot);
if (cackey_conn_ret != CACKEY_PCSC_S_OK) {
CACKEY_DEBUG_PRINTF("Unable to connect to card, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
scard_trans_ret = SCardBeginTransaction(slot->pcsc_card);
if (scard_trans_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Unable to begin transaction, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
return(CACKEY_PCSC_S_OK);
}
/*
* SYNPOSIS
* cackey_ret cackey_end_transaction(struct cackey_slot *slot);
| > > > > > > > > > > | 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 |
cackey_conn_ret = cackey_connect_card(slot);
if (cackey_conn_ret != CACKEY_PCSC_S_OK) {
CACKEY_DEBUG_PRINTF("Unable to connect to card, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
slot->transaction_depth++;
if (slot->transaction_depth > 1) {
CACKEY_DEBUG_PRINTF("Already in a transaction, performing no action (new depth = %i)", slot->transaction_depth);
return(CACKEY_PCSC_S_OK);
}
scard_trans_ret = SCardBeginTransaction(slot->pcsc_card);
if (scard_trans_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Unable to begin transaction, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
CACKEY_DEBUG_PRINTF("Sucessfully began transaction on slot (%s)", slot->pcsc_reader);
return(CACKEY_PCSC_S_OK);
}
/*
* SYNPOSIS
* cackey_ret cackey_end_transaction(struct cackey_slot *slot);
|
| ︙ | ︙ | |||
808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 |
CACKEY_DEBUG_PRINTF("Called.");
if (!slot->pcsc_card_connected) {
CACKEY_DEBUG_PRINTF("Card is not connected, unable to end transaction");
return(CACKEY_PCSC_E_GENERIC);
}
scard_trans_ret = SCardEndTransaction(slot->pcsc_card, SCARD_LEAVE_CARD);
if (scard_trans_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Unable to end transaction, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
return(CACKEY_PCSC_S_OK);
}
/* APDU Related Functions */
/*
* SYNPOSIS
| > > > > > > > > > > > > > > > > | 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 |
CACKEY_DEBUG_PRINTF("Called.");
if (!slot->pcsc_card_connected) {
CACKEY_DEBUG_PRINTF("Card is not connected, unable to end transaction");
return(CACKEY_PCSC_E_GENERIC);
}
if (slot->transaction_depth == 0) {
CACKEY_DEBUG_PRINTF("Terminating a transaction that has not begun!");
return(CACKEY_PCSC_E_GENERIC);
}
slot->transaction_depth--;
if (slot->transaction_depth > 0) {
CACKEY_DEBUG_PRINTF("Transactions still in progress, not terminating on-card Transaction (current depth = %i)", slot->transaction_depth);
return(CACKEY_PCSC_E_GENERIC);
}
scard_trans_ret = SCardEndTransaction(slot->pcsc_card, SCARD_LEAVE_CARD);
if (scard_trans_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Unable to end transaction, returning in error");
return(CACKEY_PCSC_E_GENERIC);
}
CACKEY_DEBUG_PRINTF("Sucessfully terminated transaction on slot (%s)", slot->pcsc_reader);
return(CACKEY_PCSC_S_OK);
}
/* APDU Related Functions */
/*
* SYNPOSIS
|
| ︙ | ︙ | |||
927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 |
xmit_buf[xmit_len++] = data[idx];
}
}
if (le != 0x00) {
xmit_buf[xmit_len++] = le;
}
CACKEY_DEBUG_PRINTBUF("Sending APDU:", xmit_buf, xmit_len);
recv_len = sizeof(recv_buf);
scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T1, recv_buf, &recv_len);
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);
if (scard_xmit_ret == SCARD_W_RESET_CARD) {
CACKEY_DEBUG_PRINTF("Reset required, please hold...");
scard_reconn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, &protocol);
if (scard_reconn_ret == SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Reset successful, retransmitting");
scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T0, recv_buf, &recv_len);
if (scard_xmit_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Retransmit failed, returning in failure after disconnecting the card (SCardTransmit = %s/%li)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (long) scard_xmit_ret);
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
return(CACKEY_PCSC_E_GENERIC);
}
} else {
CACKEY_DEBUG_PRINTF("Disconnecting card");
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
CACKEY_DEBUG_PRINTF("Returning in failure");
return(CACKEY_PCSC_E_GENERIC);
}
} else {
CACKEY_DEBUG_PRINTF("Disconnecting card");
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
CACKEY_DEBUG_PRINTF("Returning in failure");
return(CACKEY_PCSC_E_GENERIC);
}
}
CACKEY_DEBUG_PRINTBUF("Returned Value:", recv_buf, recv_len);
if (recv_len < 2) {
/* Minimal response length is 2 bytes, returning in failure */
CACKEY_DEBUG_PRINTF("Response too small, returning in failure (recv_len = %lu)", (unsigned long) recv_len);
return(CACKEY_PCSC_E_GENERIC);
}
/* Determine result code */
major_rc = recv_buf[recv_len - 2];
minor_rc = recv_buf[recv_len - 1];
| > > > > > > > > > > > > > > > > > > > > > > > > > > | 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 |
xmit_buf[xmit_len++] = data[idx];
}
}
if (le != 0x00) {
xmit_buf[xmit_len++] = le;
}
/* Begin Smartcard Transaction */
cackey_begin_transaction(slot);
CACKEY_DEBUG_PRINTBUF("Sending APDU:", xmit_buf, xmit_len);
recv_len = sizeof(recv_buf);
scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T1, recv_buf, &recv_len);
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);
slot->transaction_depth = 0;
if (scard_xmit_ret == SCARD_W_RESET_CARD) {
CACKEY_DEBUG_PRINTF("Reset required, please hold...");
scard_reconn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, &protocol);
if (scard_reconn_ret == SCARD_S_SUCCESS) {
/* Re-establish transaction, if it was present */
if (slot->transaction_depth > 0) {
slot->transaction_depth--;
cackey_begin_transaction(slot);
}
CACKEY_DEBUG_PRINTF("Reset successful, retransmitting");
scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T0, recv_buf, &recv_len);
if (scard_xmit_ret != SCARD_S_SUCCESS) {
CACKEY_DEBUG_PRINTF("Retransmit failed, returning in failure after disconnecting the card (SCardTransmit = %s/%li)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (long) scard_xmit_ret);
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
/* End Smartcard Transaction */
slot->transaction_depth = 1;
cackey_end_transaction(slot);
return(CACKEY_PCSC_E_GENERIC);
}
} else {
CACKEY_DEBUG_PRINTF("Disconnecting card");
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
/* End Smartcard Transaction */
slot->transaction_depth = 1;
cackey_end_transaction(slot);
CACKEY_DEBUG_PRINTF("Returning in failure");
return(CACKEY_PCSC_E_GENERIC);
}
} else {
CACKEY_DEBUG_PRINTF("Disconnecting card");
SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);
slot->pcsc_card_connected = 0;
/* End Smartcard Transaction */
slot->transaction_depth = 1;
cackey_end_transaction(slot);
CACKEY_DEBUG_PRINTF("Returning in failure");
return(CACKEY_PCSC_E_GENERIC);
}
}
CACKEY_DEBUG_PRINTBUF("Returned Value:", recv_buf, recv_len);
if (recv_len < 2) {
/* Minimal response length is 2 bytes, returning in failure */
CACKEY_DEBUG_PRINTF("Response too small, returning in failure (recv_len = %lu)", (unsigned long) recv_len);
/* End Smartcard Transaction */
cackey_end_transaction(slot);
return(CACKEY_PCSC_E_GENERIC);
}
/* Determine result code */
major_rc = recv_buf[recv_len - 2];
minor_rc = recv_buf[recv_len - 1];
|
| ︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 |
if (major_rc == 0x61) {
/* We need to READ */
CACKEY_DEBUG_PRINTF("Buffer read required");
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");
return(CACKEY_PCSC_E_GENERIC);
}
if (respdata_len) {
*respdata_len += tmp_respdata_len;
}
CACKEY_DEBUG_PRINTF("Returning in success (buffer read complete)");
return(CACKEY_PCSC_S_OK);
}
if (major_rc == 0x90) {
/* Success */
CACKEY_DEBUG_PRINTF("Returning in success (major_rc = 0x90)");
return(CACKEY_PCSC_S_OK);
}
| > > > > > > > > > | 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 |
if (major_rc == 0x61) {
/* We need to READ */
CACKEY_DEBUG_PRINTF("Buffer read required");
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);
return(CACKEY_PCSC_E_GENERIC);
}
if (respdata_len) {
*respdata_len += tmp_respdata_len;
}
/* End Smartcard Transaction */
cackey_end_transaction(slot);
CACKEY_DEBUG_PRINTF("Returning in success (buffer read complete)");
return(CACKEY_PCSC_S_OK);
}
/* End Smartcard Transaction */
cackey_end_transaction(slot);
if (major_rc == 0x90) {
/* Success */
CACKEY_DEBUG_PRINTF("Returning in success (major_rc = 0x90)");
return(CACKEY_PCSC_S_OK);
}
|
| ︙ | ︙ | |||
1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 |
*/
static struct cackey_pcsc_identity *cackey_read_certs(struct cackey_slot *slot, struct cackey_pcsc_identity *certs, unsigned long *count) {
struct cackey_pcsc_identity *curr_id;
struct cackey_tlv_entity *ccc_tlv, *ccc_curr, *app_tlv, *app_curr;
unsigned char ccc_aid[] = {GSCIS_AID_CCC};
unsigned char curr_aid[7];
unsigned long outidx = 0;
int certs_resizable;
int send_ret, select_ret;
CACKEY_DEBUG_PRINTF("Called.");
if (count == NULL) {
CACKEY_DEBUG_PRINTF("count is NULL, returning in failure");
return(NULL);
}
if (*count == 0) {
if (certs != NULL) {
CACKEY_DEBUG_PRINTF("Requested we return 0 objects, short-circuit");
return(certs);
}
}
/* Begin a SmartCard transaction */
| > | > > > > > | 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 |
*/
static struct cackey_pcsc_identity *cackey_read_certs(struct cackey_slot *slot, struct cackey_pcsc_identity *certs, unsigned long *count) {
struct cackey_pcsc_identity *curr_id;
struct cackey_tlv_entity *ccc_tlv, *ccc_curr, *app_tlv, *app_curr;
unsigned char ccc_aid[] = {GSCIS_AID_CCC};
unsigned char curr_aid[7];
unsigned long outidx = 0;
cackey_ret transaction_ret;
int certs_resizable;
int send_ret, select_ret;
CACKEY_DEBUG_PRINTF("Called.");
if (count == NULL) {
CACKEY_DEBUG_PRINTF("count is NULL, returning in failure");
return(NULL);
}
if (*count == 0) {
if (certs != NULL) {
CACKEY_DEBUG_PRINTF("Requested we return 0 objects, short-circuit");
return(certs);
}
}
/* Begin a SmartCard transaction */
transaction_ret = cackey_begin_transaction(slot);
if (transaction_ret != CACKEY_PCSC_S_OK) {
CACKEY_DEBUG_PRINTF("Unable begin transaction, returning in failure");
return(NULL);
}
if (certs == NULL) {
certs = malloc(sizeof(*certs) * 5);
*count = 5;
certs_resizable = 1;
} else {
certs_resizable = 0;
|
| ︙ | ︙ |