Remove redundant declarations in ssl_locl.h

[openssl.git] / test / stack_test.c

diff --git a/test/stack_test.c b/test/stack_test.c
index 25b2e001e1ec17111b99f4eee8981f57ce25c26e..ba2ceaf415df6746138d673f3e378588ea39a80e 100644 (file)
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates.  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
@@ -7,10 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* ====================================================================
- * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.
- */
-
 #include <stdio.h>
 #include <string.h>
 
@@ -20,7 +17,6 @@
 #include <openssl/crypto.h>
 
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 /* The macros below generate unused functions which error out one of the clang
@@ -197,7 +193,7 @@ static int test_uchar_stack(void)
     sk_uchar_sort(r);
 
     /* pop */
-    for (i = 0; i < n; i++) 
+    for (i = 0; i < n; i++)
         if (!TEST_ptr_eq(sk_uchar_pop(s), v + i)) {
             TEST_info("uchar pop %d", i);
             goto end;
@@ -366,10 +362,11 @@ end:
     return testresult;
 }
 
-void register_tests(void)
+int setup_tests(void)
 {
     ADD_TEST(test_int_stack);
     ADD_TEST(test_uchar_stack);
     ADD_TEST(test_SS_stack);
     ADD_TEST(test_SU_stack);
+    return 1;
 }