[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  132b5facf8d681db5dfa45828d8b02f1bf5df64b (commit)
      from  b4a7b4ec4acc712b1f22a83966ac986b510f25d8 (commit)


- Log -----------------------------------------------------------------
commit 132b5facf8d681db5dfa45828d8b02f1bf5df64b
Author: Christian Heimes <christian at python.org>
Date:   Sun Jan 21 13:19:05 2018 +0100

    Add test cases for min/max protocol API
    
    Signed-off-by: Christian Heimes <christian at python.org>
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6553)

-----------------------------------------------------------------------

Summary of changes:
 test/build.info     |  6 ++++-
 test/ssl_ctx_test.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 test/ssl_ctx_test.c

diff --git a/test/build.info b/test/build.info
index 7ec9bc9721..1ee3005b88 100644
--- a/test/build.info
+++ b/test/build.info
@@ -55,7 +55,7 @@ IF[{- !$disabled{tests} -}]
           recordlentest drbgtest drbg_cavs_test sslbuffertest \
           time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
           servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \
-          sysdefaulttest errtest gosttest \
+          sysdefaulttest errtest ssl_ctx_test gosttest \
           context_internal_test aesgcmtest params_test evp_pkey_dparams_test \
           keymgmt_internal_test
 
@@ -689,6 +689,10 @@ IF[{- !$disabled{tests} -}]
   DEPEND[namemap_internal_test]=../libcrypto.a libtestutil.a
 ENDIF
 
+  SOURCE[ssl_ctx_test]=ssl_ctx_test.c
+  INCLUDE[ssl_ctx_test]=../include
+  DEPEND[ssl_ctx_test]=../libcrypto ../libssl libtestutil.a
+
 {-
    use File::Spec::Functions;
    use File::Basename;
diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c
new file mode 100644
index 0000000000..87d476d9ec
--- /dev/null
+++ b/test/ssl_ctx_test.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (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
+ */
+
+#include "testutil.h"
+#include <openssl/ssl.h>
+
+typedef struct {
+    int min_version;
+    int max_version;
+    int min_ok;
+    int max_ok;
+    int expected_min;
+    int expected_max;
+} version_test;
+
+static const version_test version_testdata[] = {
+    /* min           max             ok    expected min    expected max */
+    {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},
+    {7,              42,             0, 0, 0,              0},
+};
+
+static int test_set_min_max_version(int idx_tst)
+{
+    SSL_CTX *ctx = NULL;
+    SSL *ssl = NULL;
+    int testresult = 0;
+    version_test t = version_testdata[idx_tst];
+
+    ctx = SSL_CTX_new(TLS_server_method());
+    if (ctx == NULL)
+        goto end;
+
+    ssl = SSL_new(ctx);
+    if (ssl == NULL)
+        goto end;
+
+    if (!TEST_int_eq(SSL_CTX_set_min_proto_version(ctx, t.min_version), t.min_ok))
+        goto end;
+    if (!TEST_int_eq(SSL_CTX_set_max_proto_version(ctx, t.max_version), t.max_ok))
+        goto end;
+    if (!TEST_int_eq(SSL_CTX_get_min_proto_version(ctx), t.expected_min))
+        goto end;
+    if (!TEST_int_eq(SSL_CTX_get_max_proto_version(ctx), t.expected_max))
+        goto end;
+
+    if (!TEST_int_eq(SSL_set_min_proto_version(ssl, t.min_version), t.min_ok))
+        goto end;
+    if (!TEST_int_eq(SSL_set_max_proto_version(ssl, t.max_version), t.max_ok))
+        goto end;
+    if (!TEST_int_eq(SSL_get_min_proto_version(ssl), t.expected_min))
+        goto end;
+    if (!TEST_int_eq(SSL_get_max_proto_version(ssl), t.expected_max))
+        goto end;
+
+    testresult = 1;
+
+  end:
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    return testresult;
+}
+
+int setup_tests(void)
+{
+    ADD_ALL_TESTS(test_set_min_max_version, sizeof(version_testdata) / sizeof(version_test));
+    return 1;
+}