Add test for CLIENT_EARLY_TRAFFIC_SECRET key logging

[openssl.git] / test / danetest.c

diff --git a/test/danetest.c b/test/danetest.c
index 89d6fb88ec44f269e4cea7d2c857b9f4c6c2e5ff..54a79ab51fefce76fcc8315aaf3b558df2fddac8 100644 (file)
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2017 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
@@ -24,7 +24,7 @@
 #endif
 #include "testutil.h"
 
-#include "e_os.h"
+#include "internal/nelem.h"
 
 #define _UC(c) ((unsigned char)(c))
 
@@ -133,6 +133,8 @@ static STACK_OF(X509) *load_chain(BIO *fp, int nelem)
         OPENSSL_free(name);
         OPENSSL_free(header);
         OPENSSL_free(data);
+        name = header = NULL;
+        data = NULL;
     }
 
     if (count == nelem) {
@@ -382,7 +384,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;
@@ -407,25 +409,20 @@ end:
     return ret;
 }
 
-int test_main(int argc, char *argv[])
+int setup_tests(void)
 {
-    int ret = 0;
-
-    if (argc != 4) {
+    if (!TEST_ptr(basedomain = test_get_argument(0))
+            || !TEST_ptr(CAfile = test_get_argument(1))
+            || !TEST_ptr(tlsafile = test_get_argument(2))) {
         TEST_error("Usage error: danetest basedomain CAfile tlsafile");
         return 0;
     }
-    basedomain = argv[1];
-    CAfile = argv[2];
-    tlsafile = argv[3];
 
     ADD_TEST(run_tlsatest);
-
-    ret = run_tests(argv[0]);
-    return ret;
+    return 1;
 }
 
-#include <internal/dane.h>
+#include "internal/dane.h"
 
 static void store_ctx_dane_init(X509_STORE_CTX *store_ctx, SSL *ssl)
 {