diff options
| author | Steve Huston <shuston@riverace.com> | 2015-01-09 11:29:00 -0500 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2015-01-09 12:42:08 -0500 |
| commit | 8c7e1add36b1d66d14d1b47dd11048e843d828f6 (patch) | |
| tree | eb0c562a4bd1b4de66d3c589d0209c2d95e509ec | |
| parent | ef0dff9e5279731dd578c6e81bccbd8793d84e2d (diff) | |
| download | ATCD-8c7e1add36b1d66d14d1b47dd11048e843d828f6.tar.gz | |
Merge in cherry-pick to resolve TLS versions unsupported
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index cca47377cde..6b573a6acdb 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -272,6 +272,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; |