diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-10-24 11:08:13 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-10-24 11:08:13 -0700 |
| commit | 4ce9c87407c036fc83eb5a6044ddf976c86f53fc (patch) | |
| tree | 79a484914a928a845e8410ec65a2129516a60f62 /src/eapol_supp | |
| parent | 051af73b8f8014eff33330aead0f36944b3403e6 (diff) | |
| download | android_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.tar.gz android_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.tar.bz2 android_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.zip | |
Cumulative patch from commit fa56315cfc9ebaff2b210ed99d43dda9b16bdf56
fa56315 eap_proxy: Add context data pointer to the get_imsi call
07041c6 eap_proxy: Confirm eap_proxy initialization before reading SIM info
47d986e P2P: Check Action frame payload match before accepted TX status
d259249 Fix ENABLE_NETWORK not to reconnect in disconnected state
677cf19 hostapd: Select any supported channel if ACS fails
20f9cb1 hostapd: Allow ACS to deal with partial survey data
3645fd5 hostapd: Propagate ACS errors to iface setup
0e1d0b3 hostapd: Don't get stuck after failed ACS
af8a827 Make frequency range list routines more general
941dae0 P2P: Add more user friendly debug print of channel lists
Change-Id: I942dbbc0cb92f4e09626ec6ea17f6ea583c17f1a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eapol_supp')
| -rw-r--r-- | src/eapol_supp/eapol_supp_sm.c | 12 | ||||
| -rw-r--r-- | src/eapol_supp/eapol_supp_sm.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c index 03ec2cb4..9d7aef04 100644 --- a/src/eapol_supp/eapol_supp_sm.c +++ b/src/eapol_supp/eapol_supp_sm.c @@ -2051,3 +2051,15 @@ int eapol_sm_failed(struct eapol_sm *sm) return 0; return !sm->eapSuccess && sm->eapFail; } + + +int eapol_sm_get_eap_proxy_imsi(struct eapol_sm *sm, char *imsi, size_t *len) +{ +#ifdef CONFIG_EAP_PROXY + if (sm->eap_proxy == NULL) + return -1; + return eap_proxy_get_imsi(sm->eap_proxy, imsi, len); +#else /* CONFIG_EAP_PROXY */ + return -1; +#endif /* CONFIG_EAP_PROXY */ +} diff --git a/src/eapol_supp/eapol_supp_sm.h b/src/eapol_supp/eapol_supp_sm.h index 6faf816d..54e8a271 100644 --- a/src/eapol_supp/eapol_supp_sm.h +++ b/src/eapol_supp/eapol_supp_sm.h @@ -292,6 +292,7 @@ const char * eapol_sm_get_method_name(struct eapol_sm *sm); void eapol_sm_set_ext_pw_ctx(struct eapol_sm *sm, struct ext_password_data *ext); int eapol_sm_failed(struct eapol_sm *sm); +int eapol_sm_get_eap_proxy_imsi(struct eapol_sm *sm, char *imsi, size_t *len); #else /* IEEE8021X_EAPOL */ static inline struct eapol_sm *eapol_sm_init(struct eapol_ctx *ctx) { |