Skip to content

Commit f4a1242

Browse files
author
Artem Hevorhian
committed
RDKB-58489: Support to configure latest authentication and encryption
keys (sae-ext and gcmp). Signed-off-by: Artem Hevorhian <[email protected]>
1 parent b9caacd commit f4a1242

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

source/db/wifi_db_apis.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6697,7 +6697,11 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config,
66976697
cfg.u.bss_info.security.mode = wifi_security_mode_wpa2_personal;
66986698
#endif
66996699
}
6700-
cfg.u.bss_info.security.encr = wifi_encryption_aes;
6700+
#ifdef IEEE80211BE
6701+
cfg.u.bss_info.security.encr = wifi_encryption_aes_gcmp256;
6702+
#else
6703+
cfg.u.bss_info.security.encr = wifi_encryption_aes;
6704+
#endif
67016705
cfg.u.bss_info.bssHotspot = false;
67026706
cfg.u.bss_info.mbo_enabled = false;
67036707
} else {

source/utils/wifi_validator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,8 +1103,8 @@ int validate_enterprise_security(const cJSON *security, wifi_vap_info_t *vap_inf
11031103
}
11041104
if (strcmp(param->valuestring, "AES") == 0) {
11051105
vap_info->u.bss_info.security.encr = wifi_encryption_aes;
1106-
} else {
1107-
vap_info->u.bss_info.security.encr = wifi_encryption_aes_tkip;
1106+
} else if (strcmp(param->valuestring, "AES+GCMP") == 0) {
1107+
vap_info->u.bss_info.security.encr = wifi_encryption_aes_gcmp256;
11081108
}
11091109

11101110
// MFPConfig

source/webconfig/wifi_ovsdb_translator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ webconfig_error_t translator_ovsdb_init(webconfig_subdoc_data_t *data)
920920
default_vap_info->u.bss_info.security.mode = wifi_security_mode_wpa3_transition;
921921
default_vap_info->u.bss_info.security.wpa3_transition_disable = false;
922922
default_vap_info->u.bss_info.security.mfp = wifi_mfp_cfg_optional;
923-
default_vap_info->u.bss_info.security.encr = wifi_encryption_aes;
923+
default_vap_info->u.bss_info.security.encr = wifi_encryption_aes_gcmp256;
924924
#else
925925
default_vap_info->u.bss_info.security.mode = wifi_security_mode_wpa2_personal;
926926
#endif

0 commit comments

Comments
 (0)