From 6405f487c6431792e09de8d9a5b71343513cacc9 Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Sat, 25 Aug 2018 03:54:25 +0200 Subject: [PATCH] unit: Update handshake_state WPA/RSN IE setter names --- unit/test-eapol.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/unit/test-eapol.c b/unit/test-eapol.c index 17d76640..1bc5f15d 100644 --- a/unit/test-eapol.c +++ b/unit/test-eapol.c @@ -2171,11 +2171,11 @@ static void eapol_sm_test_ptk(const void *data) handshake_state_set_authenticator_address(hs, aa); handshake_state_set_supplicant_address(hs, spa); - r = handshake_state_set_own_rsn(hs, + r = handshake_state_set_supplicant_rsn(hs, eapol_key_data_4 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_rsn(hs, ap_rsne); + handshake_state_set_authenticator_rsn(hs, ap_rsne); eapol_start(sm); __eapol_set_tx_packet_func(verify_step2); @@ -2235,11 +2235,11 @@ static void eapol_sm_test_igtk(const void *data) handshake_state_set_authenticator_address(hs, aa); handshake_state_set_supplicant_address(hs, spa); - r = handshake_state_set_own_rsn(hs, + r = handshake_state_set_supplicant_rsn(hs, eapol_key_data_30 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_rsn(hs, ap_rsne); + handshake_state_set_authenticator_rsn(hs, ap_rsne); eapol_start(sm); __eapol_set_tx_packet_func(verify_step2); @@ -2299,11 +2299,11 @@ static void eapol_sm_test_wpa2_ptk_gtk(const void *data) handshake_state_set_authenticator_address(hs, aa); handshake_state_set_supplicant_address(hs, spa); - r = handshake_state_set_own_rsn(hs, + r = handshake_state_set_supplicant_rsn(hs, eapol_key_data_8 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_rsn(hs, ap_rsne); + handshake_state_set_authenticator_rsn(hs, ap_rsne); eapol_start(sm); __eapol_set_tx_packet_func(verify_step2); @@ -2366,11 +2366,11 @@ static void eapol_sm_test_wpa_ptk_gtk(const void *data) handshake_state_set_pmk(hs, psk, sizeof(psk)); handshake_state_set_authenticator_address(hs, ap_address); handshake_state_set_supplicant_address(hs, sta_address); - r = handshake_state_set_own_wpa(hs, + r = handshake_state_set_supplicant_wpa(hs, eapol_key_data_14 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_wpa(hs, ap_wpa_ie); + handshake_state_set_authenticator_wpa(hs, ap_wpa_ie); eapol_start(sm); __eapol_set_tx_packet_func(verify_step2); @@ -2434,11 +2434,11 @@ static void eapol_sm_test_wpa_ptk_gtk_2(const void *data) handshake_state_set_authenticator_address(hs, ap_address); handshake_state_set_supplicant_address(hs, sta_address); - r = handshake_state_set_own_wpa(hs, + r = handshake_state_set_supplicant_wpa(hs, eapol_key_data_20 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_wpa(hs, ap_wpa_ie); + handshake_state_set_authenticator_wpa(hs, ap_wpa_ie); eapol_start(sm); __eapol_set_tx_packet_func(verify_step2); @@ -2549,11 +2549,11 @@ static void eapol_sm_wpa2_retransmit_test(const void *data) handshake_state_set_authenticator_address(hs, ap_address); handshake_state_set_supplicant_address(hs, sta_address); - r = handshake_state_set_own_rsn(hs, + r = handshake_state_set_supplicant_rsn(hs, eapol_key_data_8 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_rsn(hs, ap_rsne); + handshake_state_set_authenticator_rsn(hs, ap_rsne); eapol_start(sm); ptk_step1 = eapol_key_validate(eapol_key_data_7, @@ -2914,11 +2914,11 @@ static void eapol_sm_test_tls(struct eapol_8021x_tls_test_state *s, handshake_state_set_event_func(hs, verify_handshake_successful, NULL); __eapol_set_tx_user_data(s); - r = handshake_state_set_own_wpa(hs, + r = handshake_state_set_supplicant_wpa(hs, eapol_key_data_14 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_wpa(hs, ap_wpa_ie); + handshake_state_set_authenticator_wpa(hs, ap_wpa_ie); settings = l_settings_new(); l_settings_load_from_data(settings, config, strlen(config)); @@ -3290,11 +3290,11 @@ static void eapol_sm_test_eap_nak(const void *data) handshake_state_set_event_func(hs, test_handshake_event, NULL); __eapol_set_tx_user_data(&s); - r = handshake_state_set_own_wpa(hs, + r = handshake_state_set_supplicant_wpa(hs, eapol_key_data_20 + sizeof(struct eapol_key)); assert(r); - handshake_state_set_ap_wpa(hs, ap_wpa_ie); + handshake_state_set_authenticator_wpa(hs, ap_wpa_ie); settings = l_settings_new(); l_settings_load_from_data(settings, eapol_8021x_config, @@ -3387,8 +3387,8 @@ static void eapol_ft_handshake_test(const void *data) handshake_state_set_supplicant_address(hs, spa); handshake_state_set_ssid(hs, (void *) ssid, strlen(ssid)); - handshake_state_set_own_rsn(hs, own_rsne); - handshake_state_set_ap_rsn(hs, ap_rsne); + handshake_state_set_supplicant_rsn(hs, own_rsne); + handshake_state_set_authenticator_rsn(hs, ap_rsne); handshake_state_set_mde(hs, mde); handshake_state_set_fte(hs, fte); handshake_state_set_kh_ids(hs, r0khid, strlen((void *) r0khid), r1khid);