Skip to content

Commit 245379e

Browse files
committed
fix(wifi_remote): Update per v5.5 espressif/esp-idf@07540f3253d
1 parent c17cb8f commit 245379e

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

components/esp_wifi_remote/idf_v5.5/Kconfig.wifi.in

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,17 @@ config WIFI_RMT_ENABLE_WPA3_SAE
289289
config WIFI_RMT_ENABLE_SAE_PK
290290
bool "Enable SAE-PK"
291291
default y
292-
depends on WIFI_RMT_ENABLE_WPA3_SAE
292+
depends on (WIFI_RMT_ENABLE_WPA3_SAE && WIFI_RMT_ENABLE_SAE_H2E)
293293
help
294294
Select this option to enable SAE-PK
295295

296+
config WIFI_RMT_ENABLE_SAE_H2E
297+
bool "Enable SAE-H2E"
298+
default y
299+
depends on WIFI_RMT_ENABLE_WPA3_SAE
300+
help
301+
Select this option to enable SAE-H2E
302+
296303
config WIFI_RMT_SOFTAP_SAE_SUPPORT
297304
bool "Enable WPA3 Personal(SAE) SoftAP"
298305
default y
@@ -855,10 +862,17 @@ endif
855862
if WIFI_RMT_ENABLE_SAE_PK
856863
config ESP_WIFI_ENABLE_SAE_PK # ignore: multiple-definition
857864
bool
858-
depends on WIFI_RMT_ENABLE_WPA3_SAE
865+
depends on (WIFI_RMT_ENABLE_WPA3_SAE && WIFI_RMT_ENABLE_SAE_H2E)
859866
default WIFI_RMT_ENABLE_SAE_PK
860867
endif
861868

869+
if WIFI_RMT_ENABLE_SAE_H2E
870+
config ESP_WIFI_ENABLE_SAE_H2E # ignore: multiple-definition
871+
bool
872+
depends on WIFI_RMT_ENABLE_WPA3_SAE
873+
default WIFI_RMT_ENABLE_SAE_H2E
874+
endif
875+
862876
if WIFI_RMT_SOFTAP_SAE_SUPPORT
863877
config ESP_WIFI_SOFTAP_SAE_SUPPORT # ignore: multiple-definition
864878
bool

components/esp_wifi_remote/idf_v5.5/include/esp_wifi_default_config.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
3838
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
3939
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
40+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
4041
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
4142
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
4243
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -66,6 +67,7 @@
6667
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
6768
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
6869
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
70+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
6971
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
7072
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
7173
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -114,6 +116,7 @@
114116
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
115117
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
116118
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
119+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
117120
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
118121
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
119122
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -143,6 +146,7 @@
143146
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
144147
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
145148
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
149+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
146150
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
147151
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
148152
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -192,6 +196,7 @@
192196
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
193197
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
194198
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
199+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
195200
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
196201
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
197202
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -221,6 +226,7 @@
221226
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
222227
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
223228
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
229+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
224230
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
225231
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
226232
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -270,6 +276,7 @@
270276
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
271277
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
272278
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
279+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
273280
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
274281
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
275282
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -299,6 +306,7 @@
299306
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
300307
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
301308
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
309+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
302310
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
303311
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
304312
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -344,6 +352,7 @@
344352
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
345353
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
346354
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
355+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
347356
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
348357
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
349358
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -374,6 +383,7 @@
374383
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
375384
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
376385
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
386+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
377387
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
378388
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
379389
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -425,6 +435,7 @@
425435
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
426436
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
427437
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
438+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
428439
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
429440
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
430441
#define CONFIG_WIFI_RMT_SLP_IRAM_OPT 1
@@ -457,6 +468,7 @@
457468
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
458469
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
459470
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
471+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
460472
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
461473
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
462474
#define CONFIG_ESP_WIFI_SLP_IRAM_OPT 1
@@ -504,6 +516,7 @@
504516
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
505517
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
506518
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
519+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
507520
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
508521
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
509522
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -533,6 +546,7 @@
533546
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
534547
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
535548
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
549+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
536550
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
537551
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
538552
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -578,6 +592,7 @@
578592
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
579593
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
580594
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
595+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
581596
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
582597
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
583598
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -607,6 +622,7 @@
607622
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
608623
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
609624
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
625+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
610626
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
611627
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
612628
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -658,6 +674,7 @@
658674
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
659675
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
660676
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
677+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
661678
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
662679
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
663680
#define CONFIG_WIFI_RMT_SLP_IRAM_OPT 1
@@ -690,6 +707,7 @@
690707
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
691708
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
692709
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
710+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
693711
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
694712
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
695713
#define CONFIG_ESP_WIFI_SLP_IRAM_OPT 1
@@ -742,6 +760,7 @@
742760
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
743761
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
744762
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
763+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
745764
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
746765
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
747766
#define CONFIG_WIFI_RMT_SLP_IRAM_OPT 1
@@ -774,6 +793,7 @@
774793
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
775794
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
776795
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
796+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
777797
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
778798
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
779799
#define CONFIG_ESP_WIFI_SLP_IRAM_OPT 1
@@ -821,6 +841,7 @@
821841
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
822842
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
823843
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
844+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
824845
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
825846
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
826847
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -850,6 +871,7 @@
850871
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
851872
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
852873
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
874+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
853875
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
854876
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
855877
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -895,6 +917,7 @@
895917
#define CONFIG_WIFI_RMT_RX_IRAM_OPT 1
896918
#define CONFIG_WIFI_RMT_ENABLE_WPA3_SAE 1
897919
#define CONFIG_WIFI_RMT_ENABLE_SAE_PK 1
920+
#define CONFIG_WIFI_RMT_ENABLE_SAE_H2E 1
898921
#define CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT 1
899922
#define CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA 1
900923
#define CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME 50
@@ -924,6 +947,7 @@
924947
#define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
925948
#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
926949
#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
950+
#define CONFIG_ESP_WIFI_ENABLE_SAE_H2E 1
927951
#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
928952
#define CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA 1
929953
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME 50

0 commit comments

Comments
 (0)