X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fx509_internal_test.c;h=d6b4f4f4aa019521cd48a22f2c7bd2f946cf4d04;hp=df88f890a8296afeccd0151384a87b946eee2ca1;hb=6e810f2dcab6d27a7158a23888c81882a3501b7f;hpb=e364c3b24e38bd60d40487e0a532261348a9bb10

diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index df88f890a8..d6b4f4f4aa 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 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
@@ -15,8 +15,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include "test_main.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
@@ -27,7 +26,7 @@
 #include "../crypto/x509v3/ext_dat.h"
 #include "../crypto/x509v3/standard_exts.h"
 
-static int test_standard_exts()
+static int test_standard_exts(void)
 {
     size_t i;
     int prev = -1, good = 1;
@@ -42,18 +41,15 @@ static int test_standard_exts()
     }
     if (!good) {
         tmp = standard_exts;
-        fprintf(stderr, "Extensions out of order!\n");
+        TEST_error("Extensions out of order!");
         for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
-            fprintf(stderr, "%d : %s\n", (*tmp)->ext_nid,
-                    OBJ_nid2sn((*tmp)->ext_nid));
-    } else {
-        fprintf(stderr, "Order OK\n");
+            TEST_note("%d : %s", (*tmp)->ext_nid, OBJ_nid2sn((*tmp)->ext_nid));
     }
-
     return good;
 }
 
-void register_tests()
+int setup_tests(void)
 {
     ADD_TEST(test_standard_exts);
+    return 1;
 }