Skip to content

Commit e3cc088

Browse files
gschorchtgschorcht
committed
cpu/esp32/esp-idf/wpa_supplicant: migration to ESP-IDF v5.4
1 parent a0d43f1 commit e3cc088

File tree

9 files changed

+37
-19
lines changed

9 files changed

+37
-19
lines changed

‎cpu/esp32/esp-idf/wpa_supplicant/esp_idf_wpa_supplicant.mk‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,39 @@ INCLUDES += -I$(ESP32_SDK_DIR)/components/wpa_supplicant/include
55
INCLUDES += -I$(ESP32_SDK_DIR)/components/wpa_supplicant/port/include
66
INCLUDES += -I$(ESP32_SDK_DIR)/components/wpa_supplicant/src
77
INCLUDES += -I$(ESP32_SDK_DIR)/components/wpa_supplicant/src/utils
8+
INCLUDES += -I$(ESP32_SDK_DIR)/components/wpa_supplicant/src/crypto
89

910
include $(RIOTBASE)/Makefile.base
1011

1112
ESP32_SDK_BIN = $(BINDIR)/$(MODULE)
1213

13-
# definitions for wpa_supplicant from components/wpa_supplicant/component.mk
14+
# definitions for wpa_supplicant from components/wpa_supplicant/CMakeList.txt
1415
CFLAGS += -D__ets__
15-
CFLAGS += -DCONFIG_DPP
16+
CFLAGS += -DCONFIG_CRYPTO_INTERNAL
1617
CFLAGS += -DCONFIG_ECC
18+
CFLAGS += -DCONFIG_FAST_PBKDF2
19+
CFLAGS += -DCONFIG_GMAC
1720
CFLAGS += -DCONFIG_IEEE80211W
21+
CFLAGS += -DCONFIG_NO_RADIUS
1822
CFLAGS += -DCONFIG_SHA256
19-
CFLAGS += -DCONFIG_WNM
20-
CFLAGS += -DCONFIG_WPS_PIN
21-
CFLAGS += -DCONFIG_WPS2
23+
CFLAGS += -DCONFIG_TLSV11
24+
CFLAGS += -DCONFIG_TLSV12
25+
CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
26+
CFLAGS += -DCONFIG_WPS
27+
CFLAGS += -DEAP_FAST
2228
CFLAGS += -DEAP_MSCHAPv2
2329
CFLAGS += -DEAP_PEAP
2430
CFLAGS += -DEAP_PEER_METHOD
2531
CFLAGS += -DEAP_TLS
2632
CFLAGS += -DEAP_TTLS
27-
CFLAGS += -DESP_SUPPLICANT
28-
CFLAGS += -DESP32_WORKAROUND
2933
CFLAGS += -DESPRESSIF_USE
34+
CFLAGS += -DESP_PLATFORM
35+
CFLAGS += -DESP_SUPPLICANT
3036
CFLAGS += -DIEEE8021X_EAPOL
3137
CFLAGS += -DUSE_WPA2_TASK
3238
CFLAGS += -DUSE_WPS_TASK
39+
40+
# additional compiler flags to avoid compile errors
3341
CFLAGS += -Wno-strict-aliasing
3442
CFLAGS += -Wno-format-nonliteral
3543
CFLAGS += -Wno-format-security

‎cpu/esp32/esp-idf/wpa_supplicant/esp_supplicant/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ MODULE = esp_idf_wpa_supplicant_esp_supplicant
22

33
# source file list to be compiled as configured in component.mk
44
ESP32_SDK_SRC = \
5-
components/wpa_supplicant/esp_supplicant/src/esp_dpp.c \
5+
components/wpa_supplicant/esp_supplicant/src/esp_common.c \
6+
components/wpa_supplicant/esp_supplicant/src/esp_eap_client.c \
67
components/wpa_supplicant/esp_supplicant/src/esp_hostap.c \
7-
components/wpa_supplicant/esp_supplicant/src/esp_wpa2.c \
8+
components/wpa_supplicant/esp_supplicant/src/esp_owe.c \
9+
components/wpa_supplicant/esp_supplicant/src/esp_wpa2_api_port.c \
810
components/wpa_supplicant/esp_supplicant/src/esp_wpa3.c \
911
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c \
1012
components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c \

‎cpu/esp32/esp-idf/wpa_supplicant/port/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
MODULE = esp_idf_wpa_supplicant_port
22

33
# source file list to be compiled as configured in component.mk
4-
ESP32_SDK_SRC = \
5-
components/wpa_supplicant/port/os_xtensa.c \
6-
#
4+
ESP32_SDK_SRC += components/wpa_supplicant/port/os_xtensa.c
5+
ESP32_SDK_SRC += components/wpa_supplicant/port/eloop.c
76

87
include $(ESP_IDF_WPA_SUPPLICANT_PATH)/esp_idf_wpa_supplicant.mk

‎cpu/esp32/esp-idf/wpa_supplicant/src/ap/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ MODULE = esp_idf_wpa_supplicant_ap
33
# source file list to be compiled as configured in component.mk
44
ESP32_SDK_SRC = \
55
components/wpa_supplicant/src/ap/ap_config.c \
6+
components/wpa_supplicant/src/ap/comeback_token.c \
7+
components/wpa_supplicant/src/ap/ieee802_11.c \
68
components/wpa_supplicant/src/ap/ieee802_1x.c \
9+
components/wpa_supplicant/src/ap/pmksa_cache_auth.c \
10+
components/wpa_supplicant/src/ap/sta_info.c \
711
components/wpa_supplicant/src/ap/wpa_auth.c \
812
components/wpa_supplicant/src/ap/wpa_auth_ie.c \
913
#

‎cpu/esp32/esp-idf/wpa_supplicant/src/common/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ MODULE = esp_idf_wpa_supplicant_common
22

33
# source file list to be compiled as configured in component.mk
44
ESP32_SDK_SRC = \
5-
components/wpa_supplicant/src/common/dpp.c \
5+
components/wpa_supplicant/src/common/dragonfly.c \
6+
components/wpa_supplicant/src/common/ieee802_11_common.c \
67
components/wpa_supplicant/src/common/sae.c \
78
components/wpa_supplicant/src/common/wpa_common.c \
89
#

‎cpu/esp32/esp-idf/wpa_supplicant/src/crypto/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ESP32_SDK_SRC = \
3232
components/wpa_supplicant/src/crypto/sha1-pbkdf2.c \
3333
components/wpa_supplicant/src/crypto/sha1-prf.c \
3434
components/wpa_supplicant/src/crypto/sha1-tlsprf.c \
35+
components/wpa_supplicant/src/crypto/sha1-tprf.c \
3536
components/wpa_supplicant/src/crypto/sha256.c \
3637
components/wpa_supplicant/src/crypto/sha256-internal.c \
3738
components/wpa_supplicant/src/crypto/sha256-kdf.c \
@@ -41,6 +42,7 @@ ESP32_SDK_SRC = \
4142
components/wpa_supplicant/src/crypto/sha384-prf.c \
4243
components/wpa_supplicant/src/crypto/sha384-tlsprf.c \
4344
components/wpa_supplicant/src/crypto/sha512-internal.c \
45+
components/wpa_supplicant/src/crypto/tls_internal.c \
4446
#
4547

4648
include $(ESP_IDF_WPA_SUPPLICANT_PATH)/esp_idf_wpa_supplicant.mk

‎cpu/esp32/esp-idf/wpa_supplicant/src/eap_peer/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@ MODULE = esp_idf_wpa_supplicant_eap_peer
22

33
# source file list to be compiled as configured in component.mk
44
ESP32_SDK_SRC = \
5+
components/wpa_supplicant/src/eap_common/eap_wsc_common.c \
56
components/wpa_supplicant/src/eap_peer/chap.c \
67
components/wpa_supplicant/src/eap_peer/eap.c \
78
components/wpa_supplicant/src/eap_peer/eap_common.c \
9+
components/wpa_supplicant/src/eap_peer/eap_fast.c \
10+
components/wpa_supplicant/src/eap_peer/eap_fast_common.c \
811
components/wpa_supplicant/src/eap_peer/eap_mschapv2.c \
912
components/wpa_supplicant/src/eap_peer/eap_peap.c \
1013
components/wpa_supplicant/src/eap_peer/eap_peap_common.c \
1114
components/wpa_supplicant/src/eap_peer/eap_tls.c \
1215
components/wpa_supplicant/src/eap_peer/eap_tls_common.c \
1316
components/wpa_supplicant/src/eap_peer/eap_ttls.c \
1417
components/wpa_supplicant/src/eap_peer/mschapv2.c \
18+
# eap_fast_pac.c is included by eap_fast.c
19+
# components/wpa_supplicant/src/eap_peer/eap_fast_pac.c \
1520
#
1621

1722
include $(ESP_IDF_WPA_SUPPLICANT_PATH)/esp_idf_wpa_supplicant.mk

‎cpu/esp32/esp-idf/wpa_supplicant/src/tls/Makefile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ ESP32_SDK_SRC = \
88
components/wpa_supplicant/src/tls/pkcs5.c \
99
components/wpa_supplicant/src/tls/pkcs8.c \
1010
components/wpa_supplicant/src/tls/rsa.c \
11-
components/wpa_supplicant/src/tls/tls_internal.c \
1211
components/wpa_supplicant/src/tls/tlsv1_client.c \
12+
components/wpa_supplicant/src/tls/tlsv1_client_ocsp.c \
1313
components/wpa_supplicant/src/tls/tlsv1_client_read.c \
1414
components/wpa_supplicant/src/tls/tlsv1_client_write.c \
1515
components/wpa_supplicant/src/tls/tlsv1_common.c \
1616
components/wpa_supplicant/src/tls/tlsv1_cred.c \
1717
components/wpa_supplicant/src/tls/tlsv1_record.c \
18-
components/wpa_supplicant/src/tls/tlsv1_server.c \
19-
components/wpa_supplicant/src/tls/tlsv1_server_read.c \
20-
components/wpa_supplicant/src/tls/tlsv1_server_write.c \
2118
components/wpa_supplicant/src/tls/x509v3.c \
2219
#
2320

‎cpu/esp32/esp-idf/wpa_supplicant/src/wps/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ESP32_SDK_SRC = \
99
components/wpa_supplicant/src/wps/wps_common.c \
1010
components/wpa_supplicant/src/wps/wps_dev_attr.c \
1111
components/wpa_supplicant/src/wps/wps_enrollee.c \
12-
components/wpa_supplicant/src/wps/wps_registrar.c \
13-
components/wpa_supplicant/src/wps/wps_validate.c \
1412
#
1513

1614
include $(ESP_IDF_WPA_SUPPLICANT_PATH)/esp_idf_wpa_supplicant.mk
15+
16+
CFLAGS += -Wno-format

0 commit comments

Comments
 (0)