Make EVP_PKEY_CTX_[get|set]_group_name work for DH too

[openssl.git] / test / danetest.c

diff --git a/test/danetest.c b/test/danetest.c
index a0fd0ce74b8a9ab8a929ca5d9adaa75495df9289..96b9579f3ce961253e1d7554f712081f03786bbf 100644 (file)
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * 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
@@ -24,7 +24,9 @@
 #endif
 #include "testutil.h"
 
-#include "e_os.h"
+#include "internal/nelem.h"
+
+DEFINE_STACK_OF(X509)
 
 #define _UC(c) ((unsigned char)(c))
 
@@ -384,7 +386,7 @@ static int test_tlsafile(SSL_CTX *ctx, const char *base_name,
     return ret;
 }
 
-static int run_tlsatest()
+static int run_tlsatest(void)
 {
     SSL_CTX *ctx = NULL;
     BIO *f = NULL;
@@ -393,7 +395,7 @@ static int run_tlsatest()
     if (!TEST_ptr(f = BIO_new_file(tlsafile, "r"))
             || !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method()))
             || !TEST_int_gt(SSL_CTX_dane_enable(ctx), 0)
-            || !TEST_true(SSL_CTX_load_verify_locations(ctx, CAfile, NULL))
+            || !TEST_true(SSL_CTX_load_verify_file(ctx, CAfile))
             || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha512(), 2, 1),
                             0)
             || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2),
@@ -409,25 +411,25 @@ end:
     return ret;
 }
 
-int test_main(int argc, char *argv[])
-{
-    int ret = 0;
+OPT_TEST_DECLARE_USAGE("basedomain CAfile tlsafile\n")
 
-    if (argc != 4) {
-        TEST_error("Usage error: danetest basedomain CAfile tlsafile");
+int setup_tests(void)
+{
+    if (!test_skip_common_options()) {
+        TEST_error("Error parsing test options\n");
         return 0;
     }
-    basedomain = argv[1];
-    CAfile = argv[2];
-    tlsafile = argv[3];
 
-    ADD_TEST(run_tlsatest);
+    if (!TEST_ptr(basedomain = test_get_argument(0))
+            || !TEST_ptr(CAfile = test_get_argument(1))
+            || !TEST_ptr(tlsafile = test_get_argument(2)))
+        return 0;
 
-    ret = run_tests(argv[0]);
-    return ret;
+    ADD_TEST(run_tlsatest);
+    return 1;
 }
 
-#include <internal/dane.h>
+#include "internal/dane.h"
 
 static void store_ctx_dane_init(X509_STORE_CTX *store_ctx, SSL *ssl)
 {