From c73935ee63718a5fff98104f96bbbb261fbd956e Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Fri, 9 Jan 2015 11:29:00 -0500 Subject: Merge in cherry-pick to resolve TLS versions unsupported --- ACE/ace/SSL/SSL_Context.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 2512e716ce7..84e5bfca16a 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -280,6 +280,28 @@ ACE_SSL_Context::set_mode (int mode) 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 (); break; -- cgit v1.2.1