Rewrite the X509->alert mapping code
[openssl.git] / test / rc5test.c
index bd02f72353dd90c4ea1fc59ee9ce3d36caaee0e4..d49366d9938ab5923551b9be6494562cc175139d 100644 (file)
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.h"
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC5
@@ -216,7 +216,7 @@ static int test_rc5_cbc(int n)
         memcpy(ivb, &rc5_cbc_iv[n][0], 8);
         RC5_32_cbc_encrypt(buf, buf2, 8, &key, &ivb[0], RC5_DECRYPT);
         if (!TEST_mem_eq(&rc5_cbc_plain[n][0], sizeof(rc5_cbc_plain[0]),
-                         buf2, sizeof(buf2)) != 0)
+                         buf2, sizeof(buf2)))
             testresult = 0;
     }
 
@@ -224,10 +224,11 @@ static int test_rc5_cbc(int n)
 }
 #endif
 
-void register_tests(void)
+int setup_tests(void)
 {
 #ifndef OPENSSL_NO_RC5
     ADD_ALL_TESTS(test_rc5_ecb, OSSL_NELEM(RC5key));
     ADD_ALL_TESTS(test_rc5_cbc, RC5_CBC_NUM);
 #endif
+    return 1;
 }