New Russian TLS 1.2 implementation

[openssl.git] / test / ssltest_old.c

diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 90f16056aa3d16077678871c1fde345b35c94559..d45b2786d31bfc55790dfcd6095bdf73333a95d3 100644 (file)
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -81,6 +81,9 @@
 # include <unistd.h>
 #endif
 
+DEFINE_STACK_OF(SSL_COMP)
+DEFINE_STACK_OF_STRING()
+
 static SSL_CTX *s_ctx = NULL;
 static SSL_CTX *s_ctx2 = NULL;
 
@@ -727,6 +730,7 @@ static void sv_usage(void)
     fprintf(stderr, " -should_reuse <number>     - The expected state of reusing the session\n");
     fprintf(stderr, " -no_ticket    - do not issue TLS session ticket\n");
     fprintf(stderr, " -provider <name>    - Load the given provider into the library context\n");
+    fprintf(stderr, " -config <cnf>    - Load the given config file into the library context\n");
 }
 
 static void print_key_details(BIO *out, EVP_PKEY *key)
@@ -1192,6 +1196,10 @@ int main(int argc, char *argv[])
             if (--argc < 1)
                 goto bad;
             provider = *(++argv);
+        } else if (strcmp(*argv, "-config") == 0) {
+            if (--argc < 1)
+                goto bad;
+            config = *(++argv);
         } else {
             int rv;
             arg = argv[0];
@@ -1367,6 +1375,10 @@ int main(int argc, char *argv[])
         if (libctx == NULL)
             goto end;
 
+        if (config != NULL
+                && !OPENSSL_CTX_load_config(libctx, config))
+            goto end;
+
         thisprov = OSSL_PROVIDER_load(libctx, provider);
         if (thisprov == NULL)
             goto end;