jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

RSN supp: Convert Boolean to C99 bool

Browse source 
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-04-24 01:04:24 +03:00 committed by Jouni Malinen
parent da8478a1ab
commit c9d70dd329
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rsn_supp/preauth.c
View file

@ -252,9 +252,9 @@ int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
eapol_sm_configure(sm->preauth_eapol, -1, -1, 5, 6); eapol_sm_configure(sm->preauth_eapol, -1, -1, 5, 6);
os_memcpy(sm->preauth_bssid, dst, ETH_ALEN); os_memcpy(sm->preauth_bssid, dst, ETH_ALEN);
eapol_sm_notify_portValid(sm->preauth_eapol, TRUE); eapol_sm_notify_portValid(sm->preauth_eapol, true);
/* 802.1X::portControl = Auto */ /* 802.1X::portControl = Auto */
eapol_sm_notify_portEnabled(sm->preauth_eapol, TRUE); eapol_sm_notify_portEnabled(sm->preauth_eapol, true);
eloop_register_timeout(sm->dot11RSNAConfigSATimeout, 0, eloop_register_timeout(sm->dot11RSNAConfigSATimeout, 0,
rsn_preauth_timeout, sm, NULL); rsn_preauth_timeout, sm, NULL);

18
src/rsn_supp/wpa.c
View file

@ -818,11 +818,11 @@ static void wpa_supplicant_key_neg_complete(struct wpa_sm *sm,
wpa_sm_mlme_setprotection( wpa_sm_mlme_setprotection(
sm, addr, MLME_SETPROTECTION_PROTECT_TYPE_RX_TX, sm, addr, MLME_SETPROTECTION_PROTECT_TYPE_RX_TX,
MLME_SETPROTECTION_KEY_TYPE_PAIRWISE); MLME_SETPROTECTION_KEY_TYPE_PAIRWISE);
eapol_sm_notify_portValid(sm->eapol, TRUE); eapol_sm_notify_portValid(sm->eapol, true);
if (wpa_key_mgmt_wpa_psk(sm->key_mgmt) || if (wpa_key_mgmt_wpa_psk(sm->key_mgmt) ||
sm->key_mgmt == WPA_KEY_MGMT_DPP || sm->key_mgmt == WPA_KEY_MGMT_DPP ||
sm->key_mgmt == WPA_KEY_MGMT_OWE) sm->key_mgmt == WPA_KEY_MGMT_OWE)
eapol_sm_notify_eap_success(sm->eapol, TRUE); eapol_sm_notify_eap_success(sm->eapol, true);
/* /*
* Start preauthentication after a short wait to avoid a * Start preauthentication after a short wait to avoid a
* possible race condition between the data receive and key * possible race condition between the data receive and key
@ -1723,7 +1723,7 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm,
wpa_sm_mlme_setprotection( wpa_sm_mlme_setprotection(
sm, sm->bssid, MLME_SETPROTECTION_PROTECT_TYPE_RX, sm, sm->bssid, MLME_SETPROTECTION_PROTECT_TYPE_RX,
MLME_SETPROTECTION_KEY_TYPE_PAIRWISE); MLME_SETPROTECTION_KEY_TYPE_PAIRWISE);
eapol_sm_notify_portValid(sm->eapol, TRUE); eapol_sm_notify_portValid(sm->eapol, true);
} }
wpa_sm_set_state(sm, WPA_GROUP_HANDSHAKE); wpa_sm_set_state(sm, WPA_GROUP_HANDSHAKE);
@ -2696,7 +2696,8 @@ static u32 wpa_key_mgmt_suite(struct wpa_sm *sm)
int wpa_sm_get_mib(struct wpa_sm *sm, char *buf, size_t buflen) int wpa_sm_get_mib(struct wpa_sm *sm, char *buf, size_t buflen)
{ {
char pmkid_txt[PMKID_LEN * 2 + 1]; char pmkid_txt[PMKID_LEN * 2 + 1];
int rsna, ret; bool rsna;
int ret;
size_t len; size_t len;
if (sm->cur_pmksa) { if (sm->cur_pmksa) {
@ -2705,12 +2706,9 @@ int wpa_sm_get_mib(struct wpa_sm *sm, char *buf, size_t buflen)
} else } else
pmkid_txt[0] = '\0'; pmkid_txt[0] = '\0';
if ((wpa_key_mgmt_wpa_psk(sm->key_mgmt) || rsna = (wpa_key_mgmt_wpa_psk(sm->key_mgmt) ||
wpa_key_mgmt_wpa_ieee8021x(sm->key_mgmt)) && wpa_key_mgmt_wpa_ieee8021x(sm->key_mgmt)) &&
sm->proto == WPA_PROTO_RSN) sm->proto == WPA_PROTO_RSN;
rsna = 1;
else
rsna = 0;
ret = os_snprintf(buf, buflen, ret = os_snprintf(buf, buflen,
"dot11RSNAOptionImplemented=TRUE\n" "dot11RSNAOptionImplemented=TRUE\n"
@ -2913,7 +2911,7 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
* Clear portValid to kick EAPOL state machine to re-enter * Clear portValid to kick EAPOL state machine to re-enter
* AUTHENTICATED state to get the EAPOL port Authorized. * AUTHENTICATED state to get the EAPOL port Authorized.
*/ */
eapol_sm_notify_portValid(sm->eapol, FALSE); eapol_sm_notify_portValid(sm->eapol, false);
wpa_supplicant_key_neg_complete(sm, sm->bssid, 1); wpa_supplicant_key_neg_complete(sm, sm->bssid, 1);
/* Prepare for the next transition */ /* Prepare for the next transition */