From adcdfa641cc6587eed06bf1d982b606324c93412 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Mon, 6 Feb 2023 11:37:59 +0700 Subject: [PATCH] wpa_supplicant: fix gcc-12 compile errors --- components/wpa_supplicant/src/common/bss.c | 2 +- components/wpa_supplicant/src/tls/pkcs1.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/wpa_supplicant/src/common/bss.c b/components/wpa_supplicant/src/common/bss.c index 3e200d5b26..5868328c54 100644 --- a/components/wpa_supplicant/src/common/bss.c +++ b/components/wpa_supplicant/src/common/bss.c @@ -109,7 +109,7 @@ static int wpa_bss_known(struct wpa_supplicant *wpa_s, struct wpa_bss *bss) { struct wifi_ssid *ssid = esp_wifi_sta_get_prof_ssid_internal(); - if (ssid->ssid == NULL || ssid->len == 0) + if (ssid->len == 0) return 0; if (ssid->len == bss->ssid_len && os_memcmp(ssid->ssid, bss->ssid, ssid->len) == 0) diff --git a/components/wpa_supplicant/src/tls/pkcs1.c b/components/wpa_supplicant/src/tls/pkcs1.c index 49e439d027..f4c84f6207 100644 --- a/components/wpa_supplicant/src/tls/pkcs1.c +++ b/components/wpa_supplicant/src/tls/pkcs1.c @@ -322,8 +322,6 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, return -1; } - os_free(decrypted); - if (hdr.payload + hdr.length != decrypted + decrypted_len) { wpa_printf(MSG_INFO, "PKCS #1: Extra data after signature - reject"); @@ -332,8 +330,10 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, hdr.payload + hdr.length, decrypted + decrypted_len - hdr.payload - hdr.length); + os_free(decrypted); return -1; } + os_free(decrypted); return 0; }