Don't negotiate TLSv1.3 with the ossl_shim
authorMatt Caswell <matt@openssl.org>
Mon, 12 Mar 2018 11:42:00 +0000 (11:42 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 12 Mar 2018 15:08:15 +0000 (15:08 +0000)
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)

test/ossl_shim/ossl_shim.cc

index fd6fa06..739d1bd 100644 (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";