From: Matt Caswell <matt@openssl.org>
Date: Thu, 19 Jan 2017 16:02:27 +0000 (+0000)
Subject: Re-enable TLSv1.3 session resumption related tests in sslapitest
X-Git-Tag: OpenSSL_1_1_1-pre1~2558
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b05e4ce6e14c78f15f40b73ba6696283d0e4589f;p=oweals%2Fopenssl.git

Re-enable TLSv1.3 session resumption related tests in sslapitest

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
---

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 1bd7878960..d76357ade9 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -789,12 +789,6 @@ static int execute_test_session(SSL_SESSION_TEST_FIXTURE fix)
     SSL_CTX_set_min_proto_version(cctx, TLS1_2_VERSION);
 #endif
 
-    /*
-     * TODO(TLS1.3): Test temporarily disabled for TLS1.3 until we've
-     * implemented session resumption.
-     */
-    SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION);
-
     /* Set up session cache */
     if (fix.use_ext_cache) {
         SSL_CTX_sess_set_new_cb(cctx, new_session_cb);