diff options
| author | Masashi Honma <masashi.honma@gmail.com> | 2013-11-17 10:17:09 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2013-11-17 14:47:38 (GMT) |
| commit | 22cf7d7324ee5e75d3baf905123a5554edf36e8b (patch) | |
| tree | 5da91166977683ccb191ce48129027061a0bd6a5 /wpa_supplicant | |
| parent | cea97a04f9527f026c3c3570f2c071c459513393 (diff) | |
| download | hostap-22cf7d7324ee5e75d3baf905123a5554edf36e8b.zip hostap-22cf7d7324ee5e75d3baf905123a5554edf36e8b.tar.gz hostap-22cf7d7324ee5e75d3baf905123a5554edf36e8b.tar.bz2 | |
SCARD: Clean up SIM/USIM selection
Commit eb324600295a570199a5e25eb64e60781a04fb74 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>
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/eapol_test.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/events.c | 3 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c index 9024f23..2b25b69 100644 --- a/wpa_supplicant/eapol_test.c +++ b/wpa_supplicant/eapol_test.c @@ -943,7 +943,7 @@ static int scard_test(void) unsigned char aka_ik[IK_LEN]; unsigned char aka_ck[CK_LEN]; - scard = scard_init(SCARD_TRY_BOTH, NULL); + scard = scard_init(NULL); if (scard == NULL) return -1; if (scard_set_pin(scard, "1234")) { @@ -1043,7 +1043,7 @@ static int scard_get_triplets(int argc, char *argv[]) wpa_debug_level = 99; } - scard = scard_init(SCARD_GSM_SIM_ONLY, NULL); + scard = scard_init(NULL); if (scard == NULL) { printf("Failed to open smartcard connection\n"); return -1; diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 904b533..44e6be3 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -314,8 +314,7 @@ int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s, wpa_dbg(wpa_s, MSG_DEBUG, "Selected network is configured to use SIM " "(sim=%d aka=%d) - initialize PCSC", sim, aka); - wpa_s->scard = scard_init((!sim && aka) ? SCARD_USIM_ONLY : - SCARD_TRY_BOTH, NULL); + wpa_s->scard = scard_init(NULL); if (wpa_s->scard == NULL) { wpa_msg(wpa_s, MSG_WARNING, "Failed to initialize SIM " "(pcsc-lite)"); diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 4388ad6..55cc3d3 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2753,7 +2753,7 @@ static int pcsc_reader_init(struct wpa_supplicant *wpa_s) if (!wpa_s->conf->pcsc_reader) return 0; - wpa_s->scard = scard_init(SCARD_TRY_BOTH, wpa_s->conf->pcsc_reader); + wpa_s->scard = scard_init(wpa_s->conf->pcsc_reader); if (!wpa_s->scard) return 1; |