From 310553591cd8fe7ea5f223b9cc41a283f8e6cbf6 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sat, 2 Nov 2019 13:02:37 -0400 Subject: [PATCH] Add ssl_ctx_test to test suite. Also fix the test as min version > max version is allowed because the API calls to set min and max versions are separate and there can be legitimately a temporary situation when the condition is true even with correctly working application. The failure in this condition will be detected only during a handshake attempt. Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/10337) --- test/recipes/71-test_ssl_ctx.t | 16 ++++++++++++++++ test/ssl_ctx_test.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 test/recipes/71-test_ssl_ctx.t diff --git a/test/recipes/71-test_ssl_ctx.t b/test/recipes/71-test_ssl_ctx.t new file mode 100644 index 0000000000..6d5fc7a338 --- /dev/null +++ b/test/recipes/71-test_ssl_ctx.t @@ -0,0 +1,16 @@ +#! /usr/bin/env perl +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use warnings; +use OpenSSL::Test; + +setup("ssl_ctx_test"); + +plan tests => 1; +ok(run(test(["ssl_ctx_test"]))); diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c index 87d476d9ec..58ca60a788 100644 --- a/test/ssl_ctx_test.c +++ b/test/ssl_ctx_test.c @@ -24,7 +24,7 @@ static const version_test version_testdata[] = { {0, 0, 1, 1, 0, 0}, {TLS1_VERSION, TLS1_2_VERSION, 1, 1, TLS1_VERSION, TLS1_2_VERSION}, {TLS1_2_VERSION, TLS1_2_VERSION, 1, 1, TLS1_2_VERSION, TLS1_2_VERSION}, - {TLS1_2_VERSION, TLS1_1_VERSION, 1, 0, TLS1_2_VERSION, 0}, + {TLS1_2_VERSION, TLS1_1_VERSION, 1, 1, TLS1_2_VERSION, TLS1_1_VERSION}, {7, 42, 0, 0, 0, 0}, }; -- 2.25.1