diff options
author | Kurt Roeckx <kurt@roeckx.be> | 2015-11-07 15:25:07 +0100 |
---|---|---|
committer | Kurt Roeckx <kurt@roeckx.be> | 2015-11-07 16:51:35 +0100 |
commit | 28b1055680abb28bda864bb9b49a811da20fe630 (patch) | |
tree | d2871fe3d4c0e7bc0936eecb6e5b7153385a2a36 /ACE/ace/SSL | |
parent | f39120a08256e8b0f9bd4207b9387e82a860c4fd (diff) | |
download | ATCD-28b1055680abb28bda864bb9b49a811da20fe630.tar.gz |
Remove version specific OpenSSL methods
The SSLv23_* methods are the only one that support multiple versions.
Diffstat (limited to 'ACE/ace/SSL')
-rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 64 | ||||
-rw-r--r-- | ACE/ace/SSL/SSL_Context.h | 17 |
2 files changed, 2 insertions, 79 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 9212ffe1c93..95cd66b3506 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -245,26 +245,6 @@ ACE_SSL_Context::set_mode (int mode) switch (mode) { -#if !defined (OPENSSL_NO_SSL2) - case ACE_SSL_Context::SSLv2_client: - method = ::SSLv2_client_method (); - break; - case ACE_SSL_Context::SSLv2_server: - method = ::SSLv2_server_method (); - break; - case ACE_SSL_Context::SSLv2: - method = ::SSLv2_method (); - break; -#endif /* OPENSSL_NO_SSL2 */ - case ACE_SSL_Context::SSLv3_client: - method = ::SSLv3_client_method (); - break; - case ACE_SSL_Context::SSLv3_server: - method = ::SSLv3_server_method (); - break; - case ACE_SSL_Context::SSLv3: - method = ::SSLv3_method (); - break; case ACE_SSL_Context::SSLv23_client: method = ::SSLv23_client_method (); break; @@ -274,39 +254,8 @@ ACE_SSL_Context::set_mode (int mode) case ACE_SSL_Context::SSLv23: method = ::SSLv23_method (); break; - case ACE_SSL_Context::TLSv1_client: - method = ::TLSv1_client_method (); - break; - case ACE_SSL_Context::TLSv1_server: - method = ::TLSv1_server_method (); - break; - case ACE_SSL_Context::TLSv1: - method = ::TLSv1_method (); - break; -#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION) - case ACE_SSL_Context::TLSv1_1_client: - method = ::TLSv1_1_client_method (); - break; - case ACE_SSL_Context::TLSv1_1_server: - method = ::TLSv1_1_server_method (); - break; - case ACE_SSL_Context::TLSv1_1: - method = ::TLSv1_1_method (); - break; -#endif -#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION) - case ACE_SSL_Context::TLSv1_2_client: - method = ::TLSv1_2_client_method (); - break; - case ACE_SSL_Context::TLSv1_2_server: - method = ::TLSv1_2_server_method (); - break; - case ACE_SSL_Context::TLSv1_2: - method = ::TLSv1_2_method (); - break; -#endif default: - method = ::SSLv3_method (); + method = ::SSLv23_method (); break; } @@ -492,16 +441,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, // For TLS/SSL servers scan all certificates in ca_file and ca_dir and // list them as acceptable CAs when requesting a client certificate. - if (mode_ == SSLv23 - || mode_ == SSLv23_server - || mode_ == TLSv1 - || mode_ == TLSv1_server -#if !defined (OPENSSL_NO_SSL2) - || mode_ == SSLv2 - || mode_ == SSLv2_server -#endif /* !OPENSSL_NO_SSL2 */ - || mode_ == SSLv3 - || mode_ == SSLv3_server) + if (mode_ == SSLv23 || mode_ == SSLv23_server) { // Note: The STACK_OF(X509_NAME) pointer is a copy of the pointer in // the CTX; any changes to it by way of these function calls will diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index 13932efab29..ae00e04212e 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -104,26 +104,9 @@ public: enum { INVALID_METHOD = -1, -#if !defined (OPENSSL_NO_SSL2) - SSLv2_client = 1, - SSLv2_server, - SSLv2, -#endif /* !OPENSSL_NO_SSL2 */ - SSLv3_client = 4, - SSLv3_server, - SSLv3, SSLv23_client, SSLv23_server, SSLv23, - TLSv1_client, - TLSv1_server, - TLSv1, - TLSv1_1_client, - TLSv1_1_server, - TLSv1_1, - TLSv1_2_client, - TLSv1_2_server, - TLSv1_2 }; /// Constructor |