From c8da16d9e0323a261204a438844099da5680f64d Mon Sep 17 00:00:00 2001 From: Kamil Sokolowski Date: Tue, 26 Jan 2021 13:39:26 +0100 Subject: Added support for disabling/forcing TLSv1.3 --- ACE/ace/SSL/SSL_Context.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index badc7239546..b6bd64befbd 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -349,6 +349,17 @@ ACE_SSL_Context::filter_versions (const char* versionlist) ::SSL_CTX_set_options (this->context_, SSL_OP_NO_TLSv1_2); } #endif /* SSL_OP_NO_TLSv1_2 */ + +#if defined (SSL_OP_NO_TLSv1_3) + pos = vlist.find("tlsv1.3"); + match = pos != ACE_CString::npos && + (pos == vlist.length() - 7 || + seplist.find(vlist[pos + 7]) != ACE_CString::npos); + if (!match) + { + ::SSL_CTX_set_options(this->context_, SSL_OP_NO_TLSv1_3); + } +#endif /* SSL_OP_NO_TLSv1_3 */ return 0; } -- cgit v1.2.1 From 74c1aff706b4140a106b111c9cf9e1723f92d5f0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 26 Jan 2021 13:44:33 +0100 Subject: Update ACE/ace/SSL/SSL_Context.cpp --- ACE/ace/SSL/SSL_Context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index b6bd64befbd..49dffd0bc8f 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -356,9 +356,9 @@ ACE_SSL_Context::filter_versions (const char* versionlist) (pos == vlist.length() - 7 || seplist.find(vlist[pos + 7]) != ACE_CString::npos); if (!match) - { + { ::SSL_CTX_set_options(this->context_, SSL_OP_NO_TLSv1_3); - } + } #endif /* SSL_OP_NO_TLSv1_3 */ return 0; } -- cgit v1.2.1 From de06b15490fe52f0bd712ab5dbe2ab7879c81382 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 26 Jan 2021 13:54:55 +0100 Subject: Updated identation --- ACE/ace/SSL/SSL_Context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 49dffd0bc8f..3fff8fa365e 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -353,8 +353,8 @@ ACE_SSL_Context::filter_versions (const char* versionlist) #if defined (SSL_OP_NO_TLSv1_3) pos = vlist.find("tlsv1.3"); match = pos != ACE_CString::npos && - (pos == vlist.length() - 7 || - seplist.find(vlist[pos + 7]) != ACE_CString::npos); + (pos == vlist.length() - 7 || + seplist.find(vlist[pos + 7]) != ACE_CString::npos); if (!match) { ::SSL_CTX_set_options(this->context_, SSL_OP_NO_TLSv1_3); -- cgit v1.2.1