Fix some style issues with TLSv1.3 state machine PR

[openssl.git] / test / clienthellotest.c

diff --git a/test/clienthellotest.c b/test/clienthellotest.c
index b8157f23c657b27a1ce947b0a456dfca2cc094f5..61e81c3833a1a0f2e59164e568786a051b3b479f 100644 (file)
--- a/test/clienthellotest.c
+++ b/test/clienthellotest.c
@@ -56,10 +56,23 @@ int main(int argc, char *argv[])
     for (; currtest < TOTAL_NUM_TESTS; currtest++) {
         testresult = 0;
         ctx = SSL_CTX_new(TLS_method());
     for (; currtest < TOTAL_NUM_TESTS; currtest++) {
         testresult = 0;
         ctx = SSL_CTX_new(TLS_method());

+
+        /* Testing for session tickets <= TLS1.2; not relevant for 1.3 */
+        if (ctx == NULL || !SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION))
+            goto end;
+

         con = SSL_new(ctx);
         con = SSL_new(ctx);

+        if (con == NULL)
+            goto end;

 
         rbio = BIO_new(BIO_s_mem());
         wbio = BIO_new(BIO_s_mem());
 
         rbio = BIO_new(BIO_s_mem());
         wbio = BIO_new(BIO_s_mem());

+        if (rbio == NULL || wbio == NULL) {
+            BIO_free(rbio);
+            BIO_free(wbio);
+            goto end;
+        }
+

         SSL_set_bio(con, rbio, wbio);
         SSL_set_connect_state(con);
 
         SSL_set_bio(con, rbio, wbio);
         SSL_set_connect_state(con);