From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 21 Oct 2015 20:17:30 +0000 (-0400)
Subject: Remove unused options
X-Git-Tag: release_3_0_11~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=465e9fdf4544bc1cf0f65d3a6567fdc3aec84d93;p=thirdparty%2Ffreeradius-server.git

Remove unused options
---

diff --git a/src/include/tls-h b/src/include/tls-h
index e870a4afe74..1f46e633d6b 100644
--- a/src/include/tls-h
+++ b/src/include/tls-h
@@ -341,10 +341,6 @@ struct fr_tls_server_conf_t {
 	char const	*ca_file;
 	char const	*dh_file;
 	char const	*rsa_file;
-	bool		rsa_key;
-	bool		dh_key;
-	uint32_t	rsa_key_length;
-	uint32_t	dh_key_length;
 	uint32_t	verify_depth;
 	bool		file_type;
 	bool		include_length;
diff --git a/src/main/tls.c b/src/main/tls.c
index 95d141bf54a..4371ed10444 100644
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -1013,10 +1013,6 @@ static CONF_PARSER ocsp_config[] = {
 #endif
 
 static CONF_PARSER tls_server_config[] = {
-	{ "rsa_key_exchange", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, rsa_key), "no" },
-	{ "dh_key_exchange", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, dh_key), "yes" },
-	{ "rsa_key_length", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, rsa_key_length), "512" },
-	{ "dh_key_length", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, dh_key_length), "512" },
 	{ "verify_depth", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, verify_depth), "0" },
 	{ "CA_path", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT | PW_TYPE_DEPRECATED, fr_tls_server_conf_t, ca_path), NULL },
 	{ "ca_path", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT, fr_tls_server_conf_t, ca_path), NULL },
@@ -1077,10 +1073,6 @@ static CONF_PARSER tls_server_config[] = {
 
 
 static CONF_PARSER tls_client_config[] = {
-	{ "rsa_key_exchange", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, rsa_key), "no" },
-	{ "dh_key_exchange", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, dh_key), "yes" },
-	{ "rsa_key_length", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, rsa_key_length), "512" },
-	{ "dh_key_length", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, dh_key_length), "512" },
 	{ "verify_depth", FR_CONF_OFFSET(PW_TYPE_INTEGER, fr_tls_server_conf_t, verify_depth), "0" },
 	{ "ca_path", FR_CONF_OFFSET(PW_TYPE_FILE_INPUT, fr_tls_server_conf_t, ca_path), NULL },
 	{ "pem_file_type", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, file_type), "yes" },