Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/cassandra.h
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,8 @@ typedef enum CassSslVerifyFlags_ {
typedef enum CassSslTlsVersion_ {
CASS_SSL_VERSION_TLS1 = 0x00,
CASS_SSL_VERSION_TLS1_1 = 0x01,
CASS_SSL_VERSION_TLS1_2 = 0x02
CASS_SSL_VERSION_TLS1_2 = 0x02,
CASS_SSL_VERSION_TLS1_3 = 0x03
} CassSslTlsVersion;

typedef enum CassProtocolVersion_ {
Expand Down
6 changes: 4 additions & 2 deletions src/ssl/ssl_openssl_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,7 @@ OpenSslContext::OpenSslContext()
SSL_CTX_set_cert_store(ssl_ctx_, trusted_store_);
SSL_CTX_set_verify(ssl_ctx_, SSL_VERIFY_NONE, ssl_no_verify_callback);
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
// Limit to TLS 1.2 for now. TLS 1.3 has broken the handshake code.
SSL_CTX_set_max_proto_version(ssl_ctx_, TLS1_2_VERSION);
SSL_CTX_set_max_proto_version(ssl_ctx_, TLS1_3_VERSION);
#endif
#if DEBUG_SSL
SSL_CTX_set_info_callback(ssl_ctx_, ssl_info_callback);
Expand Down Expand Up @@ -632,6 +631,9 @@ CassError OpenSslContext::set_min_protocol_version(CassSslTlsVersion min_version
case CassSslTlsVersion::CASS_SSL_VERSION_TLS1_2:
method = TLS1_2_VERSION;
break;
case CassSslTlsVersion::CASS_SSL_VERSION_TLS1_3:
method = TLS1_3_VERSION;
break;
default:
// unsupported version
return CASS_ERROR_LIB_BAD_PARAMS;
Expand Down
2 changes: 1 addition & 1 deletion tests/src/unit/tests/test_socket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ TEST_F(SocketUnitTest, SslEnforceTlsVersion) {

listen();

settings.ssl_context->set_min_protocol_version(CASS_SSL_VERSION_TLS1_2);
settings.ssl_context->set_min_protocol_version(CASS_SSL_VERSION_TLS1_3);

bool is_error;
SocketConnector::Ptr connector(new SocketConnector(
Expand Down