aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/config.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-10-12 08:53:51 (GMT)
committerJouni Malinen <j@w1.fi>2014-10-12 08:55:13 (GMT)
commit07e2de3193b0a10d1e0a6d0343698b740b279047 (patch)
treecc09567d2ae5d3b112c80e7f737fe3ff37e67647 /wpa_supplicant/config.c
parentf8995f8f1cbed905cd222c056270fea94a9a61c6 (diff)
downloadhostap-07e2de3193b0a10d1e0a6d0343698b740b279047.zip
hostap-07e2de3193b0a10d1e0a6d0343698b740b279047.tar.gz
hostap-07e2de3193b0a10d1e0a6d0343698b740b279047.tar.bz2
wpa_supplicant: Allow OpenSSL cipherlist string to be configured
The new openssl_cipher configuration parameter can be used to select which TLS cipher suites are enabled for TLS-based EAP methods when OpenSSL is used as the TLS library. This parameter can be used both as a global parameter to set the default for all network blocks and as a network block parameter to override the default for each network profile. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/config.c')
-rw-r--r--wpa_supplicant/config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index b7f259b..d56e203 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -1682,6 +1682,7 @@ static const struct parse_data ssid_fields[] = {
{ INTe(engine2) },
{ INT(eapol_flags) },
{ INTe(sim_num) },
+ { STRe(openssl_ciphers) },
#endif /* IEEE8021X_EAPOL */
{ FUNC_KEY(wep_key0) },
{ FUNC_KEY(wep_key1) },
@@ -1903,6 +1904,7 @@ static void eap_peer_config_free(struct eap_peer_config *eap)
os_free(eap->pac_file);
bin_clear_free(eap->new_password, eap->new_password_len);
str_clear_free(eap->external_sim_resp);
+ os_free(eap->openssl_ciphers);
}
#endif /* IEEE8021X_EAPOL */
@@ -2023,6 +2025,7 @@ void wpa_config_free(struct wpa_config *config)
os_free(config->opensc_engine_path);
os_free(config->pkcs11_engine_path);
os_free(config->pkcs11_module_path);
+ os_free(config->openssl_ciphers);
os_free(config->pcsc_reader);
str_clear_free(config->pcsc_pin);
os_free(config->driver_param);
@@ -3823,6 +3826,7 @@ static const struct global_parse_data global_fields[] = {
{ STR(opensc_engine_path), 0 },
{ STR(pkcs11_engine_path), 0 },
{ STR(pkcs11_module_path), 0 },
+ { STR(openssl_ciphers), 0 },
{ STR(pcsc_reader), 0 },
{ STR(pcsc_pin), 0 },
{ INT(external_sim), 0 },