diff --git a/wpa_supplicant-2.9_standard/src/common/wpa_common.c b/wpa_supplicant-2.9_standard/src/common/wpa_common.c index ddd40c36921072b2f40866a89ea4ba6ca5096339..668ae7b63b24d96d845714e9df3deaa5e1cdb517 100644 --- a/wpa_supplicant-2.9_standard/src/common/wpa_common.c +++ b/wpa_supplicant-2.9_standard/src/common/wpa_common.c @@ -3686,7 +3686,7 @@ int wpa_parse_kde_ies(const u8 *buf, size_t len, struct wpa_eapol_ie_parse *ie) } dlen = 2 + pos[1]; if ((int) dlen > end - pos) { - wpa_printf(MSG_DEBUG, + wpa_printf(MSG_INFO, "WPA: EAPOL-Key Key Data underflow (ie=%d len=%d pos=%d)", pos[0], pos[1], (int) (pos - buf)); wpa_hexdump_key(MSG_DEBUG, "WPA: Key Data", buf, len); diff --git a/wpa_supplicant-2.9_standard/src/rsn_supp/wpa.c b/wpa_supplicant-2.9_standard/src/rsn_supp/wpa.c index 89985b4c58cdd75f4b0688e68a8edc025b605910..2fa35ccbb6f77748d60fb9c1b5eb5dbcb87efe0f 100644 --- a/wpa_supplicant-2.9_standard/src/rsn_supp/wpa.c +++ b/wpa_supplicant-2.9_standard/src/rsn_supp/wpa.c @@ -1243,7 +1243,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, alg = wpa_cipher_to_alg(sm->pairwise_cipher); keylen = wpa_cipher_key_len(sm->pairwise_cipher); if (keylen <= 0 || (unsigned int) keylen != sm->ptk.tk_len) { - wpa_printf(MSG_DEBUG, "WPA: TK length mismatch: %d != %lu", + wpa_printf(MSG_INFO, "WPA: TK length mismatch: %d != %lu", keylen, (long unsigned int) sm->ptk.tk_len); return -1; } @@ -2325,6 +2325,7 @@ int wpa_supplicant_send_4_of_4(struct wpa_sm *sm, const unsigned char *dst, (void *) &reply); if (!rbuf) { os_free(kde); + wpa_printf(MSG_INFO, "wpa alloc eapol failed"); return -1; } @@ -2545,8 +2546,10 @@ static void wpa_supplicant_process_3_of_4_wpa(struct wpa_sm *sm, key_info = WPA_GET_BE16(key->key_info); wpa_hexdump(MSG_DEBUG, "WPA: IE KeyData", key_data, key_data_len); - if (wpa_supplicant_parse_ies(key_data, key_data_len, &ie) < 0) + if (wpa_supplicant_parse_ies(key_data, key_data_len, &ie) < 0) { + wpa_printf(MSG_INFO, "wpa supplicant parse ies failed"); goto failed; + } if (wpa_supplicant_validate_ie(sm, sm->bssid, &ie) < 0) goto failed; @@ -2568,8 +2571,10 @@ static void wpa_supplicant_process_3_of_4_wpa(struct wpa_sm *sm, } if (wpa_supplicant_send_4_of_4(sm, wpa_sm_get_auth_addr(sm), key, ver, - key_info, &sm->ptk) < 0) + key_info, &sm->ptk) < 0) { + wpa_printf(MSG_INFO, "wpa supplicant send 4 of 4 failed"); goto failed; + } /* SNonce was successfully used in msg 3/4, so mark it to be renewed * for the next 4-Way Handshake. If msg 3 is received again, the old @@ -2660,7 +2665,7 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm, } if (mlo && !is_valid_ap_mld_mac_kde(sm, ie.mac_addr)) { - wpa_printf(MSG_DEBUG, "RSN: Invalid AP MLD MAC address KDE"); + wpa_printf(MSG_INFO, "RSN: Invalid AP MLD MAC address KDE"); goto failed; } @@ -2683,8 +2688,10 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm, if (sm->mgmt_group_cipher != WPA_CIPHER_GTK_NOT_USED && wpa_cipher_valid_mgmt_group(sm->mgmt_group_cipher) && - wpa_validate_mlo_ieee80211w_kdes(sm, i, &ie) < 0) + wpa_validate_mlo_ieee80211w_kdes(sm, i, &ie) < 0) { + wpa_printf(MSG_INFO, "wpa cipher valid mgmt group or wpa validate mlo ieee80211w kdes failed"); goto failed; + } } #ifdef CONFIG_IEEE80211R @@ -2715,11 +2722,15 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm, goto failed; } - if (!mlo && wpa_supplicant_validate_ie(sm, sm->bssid, &ie) < 0) + if (!mlo && wpa_supplicant_validate_ie(sm, sm->bssid, &ie) < 0) { + wpa_printf(MSG_INFO, "wpa supplicant validate ie failed"); goto failed; + } - if (wpa_handle_ext_key_id(sm, &ie)) + if (wpa_handle_ext_key_id(sm, &ie)) { + wpa_printf(MSG_INFO, "wpa handle ext key id failed"); goto failed; + } if (os_memcmp(sm->anonce, key->key_nonce, WPA_NONCE_LEN) != 0) { wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, @@ -2782,12 +2793,16 @@ static void wpa_supplicant_process_3_of_4(struct wpa_sm *sm, #endif /* CONFIG_DPP2 */ if (sm->use_ext_key_id && - wpa_supplicant_install_ptk(sm, key, KEY_FLAG_RX)) + wpa_supplicant_install_ptk(sm, key, KEY_FLAG_RX)) { + wpa_printf(MSG_INFO, "wpa supplicant install ptk failed"); goto failed; + } if (wpa_supplicant_send_4_of_4(sm, wpa_sm_get_auth_addr(sm), key, ver, - key_info, &sm->ptk) < 0) + key_info, &sm->ptk) < 0) { + wpa_printf(MSG_INFO, "wpa supplicant send 4 of 4 failed"); goto failed; + } /* SNonce was successfully used in msg 3/4, so mark it to be renewed * for the next 4-Way Handshake. If msg 3 is received again, the old diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c index fb55e85825f4dd45fea9eefb849f881a62a45f65..d1132f3dc078232ff3be7bae120714ff5b73b1d0 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c @@ -1436,7 +1436,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, if (wpas_network_disabled(wpa_s, ssid)) { if (debug_print) - wpa_dbg(wpa_s, MSG_DEBUG, " skip - disabled"); + wpa_dbg(wpa_s, MSG_INFO, " skip - disabled"); return false; } @@ -1503,7 +1503,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, !addr_in_list(bss->bssid, ssid->bssid_accept, ssid->num_bssid_accept)) { if (debug_print) - wpa_dbg(wpa_s, MSG_DEBUG, + wpa_dbg(wpa_s, MSG_INFO, " skip - BSSID not in list of accepted values"); return false; } @@ -1545,7 +1545,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, #ifdef CONFIG_WAPI if (((ssid->key_mgmt & WPA_KEY_MGMT_WAPI_PSK) || (ssid->key_mgmt & WPA_KEY_MGMT_WAPI_CERT)) && (wapi_ie_len == 0)) { - wpa_dbg(wpa_s, MSG_DEBUG, " skip - non-WAPI network not allowed"); + wpa_dbg(wpa_s, MSG_INFO, " skip - non-WAPI network not allowed"); return false; } #endif @@ -1554,13 +1554,13 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, if (wapi_ie_len > 0) { if (!wpa && !wpa_supplicant_match_privacy(bss, ssid)) { if (debug_print) - wpa_dbg(wpa_s, MSG_DEBUG, " skip - privacy mismatch"); + wpa_dbg(wpa_s, MSG_INFO, " skip - privacy mismatch"); return false; } } else { if (!wpa_supplicant_match_privacy(bss, ssid)) { if (debug_print) - wpa_dbg(wpa_s, MSG_DEBUG, " skip - privacy mismatch"); + wpa_dbg(wpa_s, MSG_INFO, " skip - privacy mismatch"); return false; } } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c index fcf69af462a25526229e21da9b12471353514322..e935d6c37826ec9169f445454c5e407822be3f8c 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c @@ -6489,7 +6489,7 @@ static int wpas_p2p_join(struct wpa_supplicant *wpa_s, const u8 *iface_addr, int auto_join, int op_freq, const u8 *ssid, size_t ssid_len) { - wpa_printf(MSG_DEBUG, "P2P: Request to join existing group (iface " + wpa_printf(MSG_INFO, "P2P: Request to join existing group (iface " MACSTR_SEC " dev " MACSTR_SEC " op_freq=%d)%s", MAC2STR_SEC(iface_addr), MAC2STR_SEC(dev_addr), op_freq, auto_join ? " (auto_join)" : ""); diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wps_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wps_supplicant.c index 44ca03ab2609c4673040d8393d0cf1ea9a790a92..3bf7e122d2679900769e3ff7d88c9cc3ffe05b67 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wps_supplicant.c @@ -1772,19 +1772,19 @@ int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s, wps_ie = wpas_wps_get_wps_ie(bss); if (eap_is_wps_pbc_enrollee(&ssid->eap)) { if (!wps_ie) { - wpa_printf(MSG_DEBUG, " skip - non-WPS AP"); + wpa_printf(MSG_INFO, " skip - non-WPS AP"); return 0; } if (!wps_is_selected_pbc_registrar(wps_ie)) { - wpa_printf(MSG_DEBUG, " skip - WPS AP " + wpa_printf(MSG_INFO, " skip - WPS AP " "without active PBC Registrar"); wpabuf_free(wps_ie); return 0; } /* TODO: overlap detection */ - wpa_printf(MSG_DEBUG, " selected based on WPS IE " + wpa_printf(MSG_INFO, " selected based on WPS IE " "(Active PBC)"); wpabuf_free(wps_ie); return 1; @@ -1792,7 +1792,7 @@ int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s, if (eap_is_wps_pin_enrollee(&ssid->eap)) { if (!wps_ie) { - wpa_printf(MSG_DEBUG, " skip - non-WPS AP"); + wpa_printf(MSG_INFO, " skip - non-WPS AP"); return 0; } @@ -1810,15 +1810,15 @@ int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s, if (wpa_s->scan_runs < WPS_PIN_SCAN_IGNORE_SEL_REG || age.sec < WPS_PIN_TIME_IGNORE_SEL_REG) { - wpa_printf(MSG_DEBUG, + wpa_printf(MSG_INFO, " skip - WPS AP without active PIN Registrar (scan_runs=%d age=%d)", wpa_s->scan_runs, (int) age.sec); wpabuf_free(wps_ie); return 0; } - wpa_printf(MSG_DEBUG, " selected based on WPS IE"); + wpa_printf(MSG_INFO, " selected based on WPS IE"); } else { - wpa_printf(MSG_DEBUG, " selected based on WPS IE " + wpa_printf(MSG_INFO, " selected based on WPS IE " "(Authorized MAC or Active PIN)"); } wpabuf_free(wps_ie); @@ -1826,7 +1826,7 @@ int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s, } if (wps_ie) { - wpa_printf(MSG_DEBUG, " selected based on WPS IE"); + wpa_printf(MSG_INFO, " selected based on WPS IE"); wpabuf_free(wps_ie); return 1; }