summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-06-10 12:53:51 +0200
committerThomas Haller <thaller@redhat.com>2020-06-11 11:06:30 +0200
commit1fc1a40dd50336871345176720dc5362159ff8cf (patch)
tree19cab08c20e7acac92d96fcca8996bffdfc3940c
parent941277a9d6d384955dfb5613eb643e408809649f (diff)
downloadNetworkManager-1fc1a40dd50336871345176720dc5362159ff8cf.tar.gz
supplicant: remove unused str_allowed_multiple field from options
Diffstat
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.c267
1 files changed, 133 insertions, 134 deletions
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c
index 6453188ef4..3d841f957d 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/supplicant/nm-supplicant-settings-verify.c
@@ -15,7 +15,6 @@ struct Opt {
const NMSupplOptType type;
const gint32 int_low; /* Inclusive */
const gint32 int_high; /* Inclusive; max length for strings */
- const gboolean str_allowed_multiple;
const char *const*str_allowed;
};
@@ -50,139 +49,139 @@ static const struct validate_entry validate_table[] = {
};
static const struct Opt opt_table[] = {
- { "ssid", NM_SUPPL_OPT_TYPE_BYTES, 0, 32, FALSE, NULL },
- { "bssid", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NULL },
- { "scan_ssid", NM_SUPPL_OPT_TYPE_INT, 0, 1, FALSE, NULL },
- { "frequency", NM_SUPPL_OPT_TYPE_INT, 2412, 5825, FALSE, NULL },
- { "auth_alg", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "OPEN",
- "SHARED",
- "LEAP",
- ) },
- { "psk", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "pairwise", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "CCMP",
- "TKIP",
- "NONE",
- ) },
- { "group", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "CCMP",
- "TKIP",
- "WEP104",
- "WEP40",
- ) },
- { "proto", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "WPA",
- "RSN",
- ) },
- { "key_mgmt", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "WPA-PSK",
- "WPA-PSK-SHA256",
- "FT-PSK",
- "WPA-EAP",
- "WPA-EAP-SHA256",
- "FT-EAP",
- "FT-EAP-SHA384",
- "FILS-SHA256",
- "FILS-SHA384",
- "FT-FILS-SHA256",
- "FT-FILS-SHA384",
- "IEEE8021X",
- "SAE",
- "FT-SAE",
- "OWE",
- "NONE",
- ) },
- { "wep_key0", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "wep_key1", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "wep_key2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "wep_key3", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "wep_tx_keyidx", NM_SUPPL_OPT_TYPE_INT, 0, 3, FALSE, NULL },
- { "eapol_flags", NM_SUPPL_OPT_TYPE_INT, 0, 3, FALSE, NULL },
- { "eap", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NM_MAKE_STRV (
- "LEAP",
- "MD5",
- "TLS",
- "PEAP",
- "TTLS",
- "SIM",
- "PSK",
- "FAST",
- "PWD",
- ) },
- { "identity", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "password", NM_SUPPL_OPT_TYPE_UTF8, 0, 0, FALSE, NULL },
- { "ca_path", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "subject_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "altsubject_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "domain_suffix_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "domain_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "ca_cert", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "client_cert", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "private_key", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "private_key_passwd", NM_SUPPL_OPT_TYPE_BYTES, 0, 1024, FALSE, NULL },
- { "phase1", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, TRUE, NM_MAKE_STRV (
- "peapver=0",
- "peapver=1",
- "peaplabel=1",
- "peap_outer_success=0",
- "include_tls_length=1",
- "sim_min_num_chal=3",
- "fast_provisioning=0",
- "fast_provisioning=1",
- "fast_provisioning=2",
- "fast_provisioning=3",
- "tls_disable_tlsv1_0=0",
- "tls_disable_tlsv1_0=1",
- "tls_disable_tlsv1_1=0",
- "tls_disable_tlsv1_1=1",
- "tls_disable_tlsv1_2=0",
- "tls_disable_tlsv1_2=1",
- ) },
- { "phase2", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, TRUE, NM_MAKE_STRV (
- "auth=PAP",
- "auth=CHAP",
- "auth=MSCHAP",
- "auth=MSCHAPV2",
- "auth=GTC",
- "auth=OTP",
- "auth=MD5",
- "auth=TLS",
- "autheap=MD5",
- "autheap=MSCHAPV2",
- "autheap=OTP",
- "autheap=GTC",
- "autheap=TLS",
- ) },
- { "anonymous_identity", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "ca_path2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "subject_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "altsubject_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "domain_suffix_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "domain_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "ca_cert2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "client_cert2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "private_key2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "private_key2_passwd", NM_SUPPL_OPT_TYPE_BYTES, 0, 1024, FALSE, NULL },
- { "pin", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "pcsc", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "nai", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "eappsk", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "pac_file", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "engine", NM_SUPPL_OPT_TYPE_INT, 0, 1, FALSE, NULL },
- { "engine_id", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "key_id", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "fragment_size", NM_SUPPL_OPT_TYPE_INT, 1, 2000, FALSE, NULL },
- { "proactive_key_caching", NM_SUPPL_OPT_TYPE_INT, 0, 1, FALSE, NULL },
- { "bgscan", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, FALSE, NULL },
- { "freq_list", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, FALSE, NULL },
- { "macsec_policy", NM_SUPPL_OPT_TYPE_INT, 0, 1, FALSE, NULL },
- { "macsec_integ_only", NM_SUPPL_OPT_TYPE_INT, 0, 1, FALSE, NULL },
- { "mka_cak", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "mka_ckn", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, FALSE, NULL },
- { "macsec_port", NM_SUPPL_OPT_TYPE_INT, 1, 65534, FALSE, NULL },
- { "ieee80211w", NM_SUPPL_OPT_TYPE_INT, 0, 2, FALSE, NULL },
- { "ignore_broadcast_ssid", NM_SUPPL_OPT_TYPE_INT, 0, 2, FALSE, NULL },
+ { "ssid", NM_SUPPL_OPT_TYPE_BYTES, 0, 32, NULL },
+ { "bssid", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NULL },
+ { "scan_ssid", NM_SUPPL_OPT_TYPE_INT, 0, 1, NULL },
+ { "frequency", NM_SUPPL_OPT_TYPE_INT, 2412, 5825, NULL },
+ { "auth_alg", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "OPEN",
+ "SHARED",
+ "LEAP",
+ ) },
+ { "psk", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "pairwise", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "CCMP",
+ "TKIP",
+ "NONE",
+ ) },
+ { "group", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "CCMP",
+ "TKIP",
+ "WEP104",
+ "WEP40",
+ ) },
+ { "proto", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "WPA",
+ "RSN",
+ ) },
+ { "key_mgmt", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "WPA-PSK",
+ "WPA-PSK-SHA256",
+ "FT-PSK",
+ "WPA-EAP",
+ "WPA-EAP-SHA256",
+ "FT-EAP",
+ "FT-EAP-SHA384",
+ "FILS-SHA256",
+ "FILS-SHA384",
+ "FT-FILS-SHA256",
+ "FT-FILS-SHA384",
+ "IEEE8021X",
+ "SAE",
+ "FT-SAE",
+ "OWE",
+ "NONE",
+ ) },
+ { "wep_key0", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "wep_key1", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "wep_key2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "wep_key3", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "wep_tx_keyidx", NM_SUPPL_OPT_TYPE_INT, 0, 3, NULL },
+ { "eapol_flags", NM_SUPPL_OPT_TYPE_INT, 0, 3, NULL },
+ { "eap", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "LEAP",
+ "MD5",
+ "TLS",
+ "PEAP",
+ "TTLS",
+ "SIM",
+ "PSK",
+ "FAST",
+ "PWD",
+ ) },
+ { "identity", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "password", NM_SUPPL_OPT_TYPE_UTF8, 0, 0, NULL },
+ { "ca_path", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "subject_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "altsubject_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "domain_suffix_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "domain_match", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "ca_cert", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "client_cert", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "private_key", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "private_key_passwd", NM_SUPPL_OPT_TYPE_BYTES, 0, 1024, NULL },
+ { "phase1", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "peapver=0",
+ "peapver=1",
+ "peaplabel=1",
+ "peap_outer_success=0",
+ "include_tls_length=1",
+ "sim_min_num_chal=3",
+ "fast_provisioning=0",
+ "fast_provisioning=1",
+ "fast_provisioning=2",
+ "fast_provisioning=3",
+ "tls_disable_tlsv1_0=0",
+ "tls_disable_tlsv1_0=1",
+ "tls_disable_tlsv1_1=0",
+ "tls_disable_tlsv1_1=1",
+ "tls_disable_tlsv1_2=0",
+ "tls_disable_tlsv1_2=1",
+ ) },
+ { "phase2", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NM_MAKE_STRV (
+ "auth=PAP",
+ "auth=CHAP",
+ "auth=MSCHAP",
+ "auth=MSCHAPV2",
+ "auth=GTC",
+ "auth=OTP",
+ "auth=MD5",
+ "auth=TLS",
+ "autheap=MD5",
+ "autheap=MSCHAPV2",
+ "autheap=OTP",
+ "autheap=GTC",
+ "autheap=TLS",
+ ) },
+ { "anonymous_identity", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "ca_path2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "subject_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "altsubject_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "domain_suffix_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "domain_match2", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "ca_cert2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "client_cert2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "private_key2", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "private_key2_passwd", NM_SUPPL_OPT_TYPE_BYTES, 0, 1024, NULL },
+ { "pin", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "pcsc", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "nai", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "eappsk", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "pac_file", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "engine", NM_SUPPL_OPT_TYPE_INT, 0, 1, NULL },
+ { "engine_id", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "key_id", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "fragment_size", NM_SUPPL_OPT_TYPE_INT, 1, 2000, NULL },
+ { "proactive_key_caching", NM_SUPPL_OPT_TYPE_INT, 0, 1, NULL },
+ { "bgscan", NM_SUPPL_OPT_TYPE_BYTES, 0, 0, NULL },
+ { "freq_list", NM_SUPPL_OPT_TYPE_KEYWORD, 0, 0, NULL },
+ { "macsec_policy", NM_SUPPL_OPT_TYPE_INT, 0, 1, NULL },
+ { "macsec_integ_only", NM_SUPPL_OPT_TYPE_INT, 0, 1, NULL },
+ { "mka_cak", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "mka_ckn", NM_SUPPL_OPT_TYPE_BYTES, 0, 65536, NULL },
+ { "macsec_port", NM_SUPPL_OPT_TYPE_INT, 1, 65534, NULL },
+ { "ieee80211w", NM_SUPPL_OPT_TYPE_INT, 0, 2, NULL },
+ { "ignore_broadcast_ssid", NM_SUPPL_OPT_TYPE_INT, 0, 2, NULL },
};
static gboolean
View Lorry Controller Status