denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slightly reformatted SIM pcsc code

Browse Source
This commit is contained in:
Martin Willi
2011-04-04 09:21:54 +02:00
parent 80dca77a50
commit 13d72e90c1
2 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_sim_pcsc/Makefile.am
+2 -2
View File
@@ -1,8 +1,8 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon ${pcsclite_CFLAGS} -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\" AM_CFLAGS = -rdynamic ${pcsclite_CFLAGS}
if MONOLITHIC if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la noinst_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la
src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_card.c
+42 -28
View File
@@ -63,7 +63,8 @@ static bool decode_imsi_ef(unsigned char *input, int input_len, char *output)
}; };
int i; int i;
/* Check length byte matches how many bytes we have, and that input is correct length for an IMSI */ /* Check length byte matches how many bytes we have, and that input
* is correct length for an IMSI */
if (input[0] != input_len-1 || input_len < 2 || input_len > 9) if (input[0] != input_len-1 || input_len < 2 || input_len > 9)
{ {
return FALSE; return FALSE;
@@ -110,7 +111,7 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
DBG1(DBG_IKE, "SCardEstablishContext: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardEstablishContext: %s", pcsc_stringify_error(rv));
return FALSE; return FALSE;
} }
rv = SCardListReaders(hContext, NULL, NULL, &dwReaders); rv = SCardListReaders(hContext, NULL, NULL, &dwReaders);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
@@ -124,10 +125,12 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
{ {
DBG1(DBG_IKE, "SCardListReaders: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardListReaders: %s", pcsc_stringify_error(rv));
return FALSE; return FALSE;
} }
/* mszReaders is a multi-string of readers, separated by '\0' and terminated by an additional '\0' */ /* mszReaders is a multi-string of readers, separated by '\0' and
for (cur_reader = mszReaders; *cur_reader != '\0' && found == FALSE; cur_reader += strlen(cur_reader)+1) * terminated by an additional '\0' */
for (cur_reader = mszReaders; *cur_reader != '\0' && found == FALSE;
cur_reader += strlen(cur_reader) + 1)
{ {
DWORD dwActiveProtocol = -1; DWORD dwActiveProtocol = -1;
SCARDHANDLE hCard; SCARDHANDLE hCard;
@@ -135,18 +138,18 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
SCARD_IO_REQUEST pioRecvPci; SCARD_IO_REQUEST pioRecvPci;
BYTE pbRecvBuffer[64]; BYTE pbRecvBuffer[64];
DWORD dwRecvLength; DWORD dwRecvLength;
char imsi[SIM_IMSI_MAX_LEN+1]; char imsi[SIM_IMSI_MAX_LEN + 1];
/* See GSM 11.11 for SIM APDUs */ /* See GSM 11.11 for SIM APDUs */
BYTE pbSelectMF[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x3f, 0x00 }; BYTE pbSelectMF[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x3f, 0x00 };
BYTE pbSelectDFGSM[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x7f, 0x20 }; BYTE pbSelectDFGSM[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x7f, 0x20 };
BYTE pbSelectIMSI[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x6f, 0x07 }; BYTE pbSelectIMSI[] = { 0xa0, 0xa4, 0x00, 0x00, 0x02, 0x6f, 0x07 };
BYTE pbReadBinary[] = { 0xa0, 0xb0, 0x00, 0x00, 0x09 }; BYTE pbReadBinary[] = { 0xa0, 0xb0, 0x00, 0x00, 0x09 };
BYTE pbRunGSMAlgorithm[] = { 0xa0, 0x88, 0x00, 0x00, 0x10, /*RAND*/ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; BYTE pbRunGSMAlgorithm[5 + SIM_RAND_LEN] = { 0xa0, 0x88, 0x00, 0x00, 0x10 };
BYTE pbGetResponse[] = { 0xa0, 0xc0, 0x00, 0x00, 0x0c }; BYTE pbGetResponse[] = { 0xa0, 0xc0, 0x00, 0x00, 0x0c };
/* Copy RAND into APDU */ /* Copy RAND into APDU */
memcpy(pbRunGSMAlgorithm+5, rand, SIM_RAND_LEN); memcpy(pbRunGSMAlgorithm + 5, rand, SIM_RAND_LEN);
rv = SCardConnect(hContext, cur_reader, SCARD_SHARE_SHARED, rv = SCardConnect(hContext, cur_reader, SCARD_SHARE_SHARED,
SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &hCard, &dwActiveProtocol); SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &hCard, &dwActiveProtocol);
@@ -172,13 +175,14 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
/* APDU: Select MF */ /* APDU: Select MF */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbSelectMF, sizeof(pbSelectMF), rv = SCardTransmit(hCard, pioSendPci, pbSelectMF, sizeof(pbSelectMF),
&pioRecvPci, pbRecvBuffer, &dwRecvLength); &pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
{ {
DBG1(DBG_IKE, "Select MF failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Select MF failed: %b", pbRecvBuffer, dwRecvLength);
continue; continue;
@@ -187,13 +191,14 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
/* APDU: Select DF GSM */ /* APDU: Select DF GSM */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbSelectDFGSM, sizeof(pbSelectDFGSM), rv = SCardTransmit(hCard, pioSendPci, pbSelectDFGSM, sizeof(pbSelectDFGSM),
&pioRecvPci, pbRecvBuffer, &dwRecvLength); &pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
{ {
DBG1(DBG_IKE, "Select DF GSM failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Select DF GSM failed: %b", pbRecvBuffer, dwRecvLength);
continue; continue;
@@ -202,13 +207,14 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
/* APDU: Select IMSI */ /* APDU: Select IMSI */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbSelectIMSI, sizeof(pbSelectIMSI), rv = SCardTransmit(hCard, pioSendPci, pbSelectIMSI, sizeof(pbSelectIMSI),
&pioRecvPci, pbRecvBuffer, &dwRecvLength); &pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
{ {
DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength);
continue; continue;
@@ -217,26 +223,29 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
/* APDU: Read Binary (of IMSI) */ /* APDU: Read Binary (of IMSI) */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbReadBinary, sizeof(pbReadBinary), rv = SCardTransmit(hCard, pioSendPci, pbReadBinary, sizeof(pbReadBinary),
&pioRecvPci, pbRecvBuffer, &dwRecvLength); &pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS)
{ {
DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength);
continue; continue;
} }
if (!decode_imsi_ef(pbRecvBuffer, dwRecvLength-APDU_STATUS_LEN, imsi) ) if (!decode_imsi_ef(pbRecvBuffer, dwRecvLength-APDU_STATUS_LEN, imsi))
{ {
DBG1(DBG_IKE, "Couldn't decode IMSI EF: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Couldn't decode IMSI EF: %b",
pbRecvBuffer, dwRecvLength);
continue; continue;
} }
/* The IMSI could be post/prefixed in the full NAI, so just make sure it's in there */ /* The IMSI could be post/prefixed in the full NAI, so just make sure
if( !(strlen(full_nai) && strstr(full_nai, imsi)) ) * it's in there */
if (!(strlen(full_nai) && strstr(full_nai, imsi)))
{ {
DBG1(DBG_IKE, "Not the SIM we're looking for, IMSI: %s", imsi); DBG1(DBG_IKE, "Not the SIM we're looking for, IMSI: %s", imsi);
continue; continue;
@@ -244,37 +253,41 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
/* APDU: Run GSM Algorithm */ /* APDU: Run GSM Algorithm */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbRunGSMAlgorithm, sizeof(pbRunGSMAlgorithm), rv = SCardTransmit(hCard, pioSendPci,
&pioRecvPci, pbRecvBuffer, &dwRecvLength); pbRunGSMAlgorithm, sizeof(pbRunGSMAlgorithm),
&pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
{ {
DBG1(DBG_IKE, "Run GSM Algorithm failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Run GSM Algorithm failed: %b",
pbRecvBuffer, dwRecvLength);
continue; continue;
} }
/* APDU: Get Response (of Run GSM Algorithm) */ /* APDU: Get Response (of Run GSM Algorithm) */
dwRecvLength = sizeof(pbRecvBuffer); dwRecvLength = sizeof(pbRecvBuffer);
rv = SCardTransmit(hCard, pioSendPci, pbGetResponse, sizeof(pbGetResponse), rv = SCardTransmit(hCard, pioSendPci, pbGetResponse, sizeof(pbGetResponse),
&pioRecvPci, pbRecvBuffer, &dwRecvLength); &pioRecvPci, pbRecvBuffer, &dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)
{ {
DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv)); DBG1(DBG_IKE, "SCardTransmit: %s", pcsc_stringify_error(rv));
continue; continue;
} }
if( dwRecvLength < APDU_STATUS_LEN || pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS ) if (dwRecvLength < APDU_STATUS_LEN ||
pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS)
{ {
DBG1(DBG_IKE, "Get Response failed: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Get Response failed: %b", pbRecvBuffer, dwRecvLength);
continue; continue;
} }
/* Extract out Kc and SRES from response */ /* Extract out Kc and SRES from response */
if( dwRecvLength == SIM_SRES_LEN + SIM_KC_LEN + APDU_STATUS_LEN ) if (dwRecvLength == SIM_SRES_LEN + SIM_KC_LEN + APDU_STATUS_LEN)
{ {
memcpy(sres, pbRecvBuffer, SIM_SRES_LEN); memcpy(sres, pbRecvBuffer, SIM_SRES_LEN);
memcpy(kc, pbRecvBuffer+4, SIM_KC_LEN); memcpy(kc, pbRecvBuffer+4, SIM_KC_LEN);
@@ -283,7 +296,8 @@ static bool get_triplet(private_eap_sim_pcsc_card_t *this,
} }
else else
{ {
DBG1(DBG_IKE, "Get Response incorrect length: %b", pbRecvBuffer, dwRecvLength); DBG1(DBG_IKE, "Get Response incorrect length: %b",
pbRecvBuffer, dwRecvLength);
continue; continue;
} }