summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2019-11-02 13:02:37 -0400
committerTomas Mraz <tmraz@fedoraproject.org>2019-11-08 08:23:15 +0100
commit310553591cd8fe7ea5f223b9cc41a283f8e6cbf6 (patch)
tree8a923d8fc1519afef82a91aa23f0d15e964a88b2
parenteb173822b2c02122844f4ffe89e38fe8e6d04697 (diff)
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 <levitte@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10337)
-rw-r--r--test/recipes/71-test_ssl_ctx.t16
-rw-r--r--test/ssl_ctx_test.c2
2 files changed, 17 insertions, 1 deletions
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},
};