DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

SCARD: Clean up SIM/USIM selection

Browse source 
Commit eb32460029 left an unneeded
sim_type argument to scard_init(). Remove that unnecessary argument to
clean up the implementation.

Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2013-11-17 12:17:09 +02:00 • committed by Jouni Malinen
parent cea97a04f9
commit 22cf7d7324
5 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/utils/pcsc_funcs.c
View file

@ -485,17 +485,15 @@ static int scard_get_aid(struct scard_data *scard, unsigned char *aid,
/**
* scard_init - Initialize SIM/USIM connection using PC/SC
* @sim_type: Allowed SIM types (SIM, USIM, or both)
* @reader: Reader name prefix to search for
* Returns: Pointer to private data structure, or %NULL on failure
*
* This function is used to initialize SIM/USIM connection. PC/SC is used to
* open connection to the SIM/USIM card and the card is verified to support the
* selected sim_type. In addition, local flag is set if a PIN is needed to
* access some of the card functions. Once the connection is not needed
* anymore, scard_deinit() can be used to close it.
* open connection to the SIM/USIM card. In addition, local flag is set if a
* PIN is needed to access some of the card functions. Once the connection is
* not needed anymore, scard_deinit() can be used to close it.
*/
struct scard_data * scard_init(scard_sim_type sim_type, const char *reader)
struct scard_data * scard_init(const char *reader)
{
long ret;
unsigned long len, pos;
@ -612,20 +610,14 @@ struct scard_data * scard_init(scard_sim_type sim_type, const char *reader)
blen = sizeof(buf);
scard->sim_type = SCARD_GSM_SIM;
if (sim_type == SCARD_USIM_ONLY || sim_type == SCARD_TRY_BOTH) {
wpa_printf(MSG_DEBUG, "SCARD: verifying USIM support");
if (_scard_select_file(scard, SCARD_FILE_MF, buf, &blen,
SCARD_USIM, NULL, 0)) {
wpa_printf(MSG_DEBUG, "SCARD: USIM is not supported");
if (sim_type == SCARD_USIM_ONLY)
goto failed;
wpa_printf(MSG_DEBUG, "SCARD: Trying to use GSM SIM");
scard->sim_type = SCARD_GSM_SIM;
} else {
wpa_printf(MSG_DEBUG, "SCARD: USIM is supported");
scard->sim_type = SCARD_USIM;
}
wpa_printf(MSG_DEBUG, "SCARD: verifying USIM support");
if (_scard_select_file(scard, SCARD_FILE_MF, buf, &blen,
SCARD_USIM, NULL, 0)) {
wpa_printf(MSG_DEBUG, "SCARD: USIM is not supported. Trying to use GSM SIM");
scard->sim_type = SCARD_GSM_SIM;
} else {
wpa_printf(MSG_DEBUG, "SCARD: USIM is supported");
scard->sim_type = SCARD_USIM;
}
if (scard->sim_type == SCARD_GSM_SIM) {

11
src/utils/pcsc_funcs.h
View file

@ -9,15 +9,8 @@
#ifndef PCSC_FUNCS_H
#define PCSC_FUNCS_H
typedef enum {
SCARD_GSM_SIM_ONLY,
SCARD_USIM_ONLY,
SCARD_TRY_BOTH
} scard_sim_type;
#ifdef PCSC_FUNCS
struct scard_data * scard_init(scard_sim_type sim_type, const char *reader);
struct scard_data * scard_init(const char *reader);
void scard_deinit(struct scard_data *scard);
int scard_set_pin(struct scard_data *scard, const char *pin);
@ -34,7 +27,7 @@ int scard_supports_umts(struct scard_data *scard);
#else /* PCSC_FUNCS */
#define scard_init(s, r) NULL
#define scard_init(r) NULL
#define scard_deinit(s) do { } while (0)
#define scard_set_pin(s, p) -1
#define scard_get_imsi(s, i, l) -1