diff options
author | Thomas Haller <thaller@redhat.com> | 2020-06-10 10:24:42 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-06-11 11:11:54 +0200 |
commit | 544a67876d0a9b283a8855d5fbfc152817f0a5a8 (patch) | |
tree | 67d8d1c73f89663f489c827a972243b9b0f41a35 | |
parent | a2e3f70e83228a8eef2bfd78e3873248ff8a6dd8 (diff) | |
download | NetworkManager-544a67876d0a9b283a8855d5fbfc152817f0a5a8.tar.gz |
supplicant: fix verification of key_mgmt config for FT-FILS-SHA{256,384}
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/468
Fixes: d17a0a090555 ('supplicant: allow fast transition for WPA-PSK and WPA-EAP')
(cherry picked from commit e7a74721bee592b212be6c858c2da99bd3d635f3)
(cherry picked from commit e5fb7764417fe3f584db22f1deda23ba1f6c81ed)
(cherry picked from commit f238f0a71438c896a181e7881ff0d625962b3750)
-rw-r--r-- | src/supplicant/nm-supplicant-settings-verify.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c index 25cc0bc61a..7c1a179bd2 100644 --- a/src/supplicant/nm-supplicant-settings-verify.c +++ b/src/supplicant/nm-supplicant-settings-verify.c @@ -69,7 +69,8 @@ static const char *const proto_allowed[] = { "WPA", "RSN", NULL }; static const char *const key_mgmt_allowed[] = { "WPA-PSK", "WPA-PSK-SHA256", "FT-PSK", "WPA-EAP", "WPA-EAP-SHA256", "FT-EAP", "FT-EAP-SHA384", "FILS-SHA256", "FILS-SHA384", - "IEEE8021X", "WPA-NONE", "SAE", "FT-SAE", + "FT-FILS-SHA256", "FT-FILS-SHA384", + "IEEE8021X", "SAE", "FT-SAE", "NONE", NULL }; static const char *const auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL }; static const char *const eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM", |