X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fchacha_internal_test.c;h=878bd752e054bb70d56c9fd4ddd590154afba3eb;hb=7421f085005e0d7a1dd2fe61b991ff23cef91c22;hp=0c0be9b38792b552a07dabb9a60692c6784475f2;hpb=27fc8ae22001a066ff99a8108f8dd70e547d6d64;p=oweals%2Fopenssl.git

diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 0c0be9b387..878bd752e0 100644
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2017 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
@@ -14,20 +14,19 @@
 
 #include <string.h>
 #include <openssl/opensslconf.h>
-#include "test_main.h"
 #include "testutil.h"
-#include "internal/chacha.h"
+#include "crypto/chacha.h"
 
-const static unsigned int key[] = {
+static const unsigned int key[] = {
     0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c,
     0x13121110, 0x17161514, 0x1b1a1918, 0x1f1e1d1c
 };
 
-const static unsigned int ivp[] = {
+static const unsigned int ivp[] = {
     0x00000000, 0x00000000, 0x03020100, 0x07060504
 };
 
-const static unsigned char ref[] = {
+static const unsigned char ref[] = {
     0xf7, 0x98, 0xa1, 0x89, 0xf1, 0x95, 0xe6, 0x69,
     0x82, 0x10, 0x5f, 0xfb, 0x64, 0x0b, 0xb7, 0x75,
     0x7f, 0x57, 0x9d, 0xa3, 0x16, 0x02, 0xfc, 0x93,
@@ -180,11 +179,12 @@ static int test_cha_cha_internal(int n)
     return 1;
 }
 
-void register_tests(void)
+int setup_tests(void)
 {
 #ifdef CPUID_OBJ
     OPENSSL_cpuid_setup();
 #endif
 
     ADD_ALL_TESTS(test_cha_cha_internal, sizeof(ref));
+    return 1;
 }