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:43:11 -0500 |
| commit | c73935ee63718a5fff98104f96bbbb261fbd956e (patch) | |
| tree | a5f18a9432fc928b491e6f06f12e365cc2b65910 | |
| parent | 72b911266be1bcf31fc8a8ff4e7d3f15541b1325 (diff) | |
| download | ATCD-c73935ee63718a5fff98104f96bbbb261fbd956e.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 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; |