wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't negotiate TLSv1.3 with the ossl_shim

Browse source 
The ossl_shim doesn't know about TLSv1.3 so we should disable that
protocol version for all tests for now.

This fixes the current Travis failures.

[extended tests]

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5593)
This commit is contained in:
Matt Caswell 2018-03-12 11:42:00 +00:00
parent df0fed9aab
commit aaaa6ac11b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/ossl_shim/ossl_shim.cc
View file

@ -533,6 +533,12 @@ static bssl::UniquePtr<SSL_CTX> SetupCtx(const TestConfig *config) {
!SSL_CTX_set_max_proto_version(ssl_ctx.get(), TLS1_3_VERSION)) {
return nullptr;
}
#else
/* Ensure we don't negotiate TLSv1.3 until we can handle it */
if (!config->is_dtls &&
!SSL_CTX_set_max_proto_version(ssl_ctx.get(), TLS1_2_VERSION)) {
return nullptr;
}
#endif
std::string cipher_list = "ALL";