Fix a bunch of gcc warnings in packettest.c

[openssl.git] / test / chacha_internal_test.c

diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 1c8d90a1afcd362bbe02f8d0134f3352ba714852..be4401218771d6790599331a2d18c64d62042ced 100644 (file)
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -14,30 +14,19 @@
 
 #include <string.h>
 #include <openssl/opensslconf.h>
-#include "test_main.h"
 #include "testutil.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/chacha.h"
 
-#ifdef __VMS
-# pragma names restore
-#endif
-
-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,
@@ -190,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;
 }