X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=test%2Fcurve448_internal_test.c;h=8c9b09da98bcd90701e45b17d7d0a57e6f9526cf;hb=7622baf8a7c3e9084f97a4f41406a29ef5d04fc3;hp=c63bded7d59451520a6384f184de3f564b8db1e0;hpb=2c9def25b1948f5f231b1acc15c060d9c2264816;p=openssl.git

diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c
index c63bded7d5..8c9b09da98 100644
--- a/test/curve448_internal_test.c
+++ b/test/curve448_internal_test.c
@@ -10,11 +10,26 @@
 #include <string.h>
 #include <openssl/e_os2.h>
 #include <openssl/evp.h>
+
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "curve448_lcl.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
+#include "testutil.h"
+
+static unsigned int max = 1000;
+static unsigned int verbose = 0;
+
 /* Test vectors from RFC7748 for X448 */
 
-const uint8_t in_scalar1[56] = {
+static const uint8_t in_scalar1[56] = {
     0x3d, 0x26, 0x2f, 0xdd, 0xf9, 0xec, 0x8e, 0x88, 0x49, 0x52, 0x66, 0xfe,
     0xa1, 0x9a, 0x34, 0xd2, 0x88, 0x82, 0xac, 0xef, 0x04, 0x51, 0x04, 0xd0,
     0xd1, 0xaa, 0xe1, 0x21, 0x70, 0x0a, 0x77, 0x9c, 0x98, 0x4c, 0x24, 0xf8,
@@ -22,7 +37,7 @@ const uint8_t in_scalar1[56] = {
     0x29, 0x25, 0x9a, 0x4f, 0x1c, 0x60, 0x0a, 0xd3
 };
 
-const uint8_t in_u1[56] = {
+static const uint8_t in_u1[56] = {
     0x06, 0xfc, 0xe6, 0x40, 0xfa, 0x34, 0x87, 0xbf, 0xda, 0x5f, 0x6c, 0xf2,
     0xd5, 0x26, 0x3f, 0x8a, 0xad, 0x88, 0x33, 0x4c, 0xbd, 0x07, 0x43, 0x7f,
     0x02, 0x0f, 0x08, 0xf9, 0x81, 0x4d, 0xc0, 0x31, 0xdd, 0xbd, 0xc3, 0x8c,
@@ -30,7 +45,7 @@ const uint8_t in_u1[56] = {
     0x8a, 0xa7, 0xa7, 0xfb, 0x4e, 0xf8, 0xa0, 0x86
 };
 
-const uint8_t out_u1[56] = {
+static const uint8_t out_u1[56] = {
     0xce, 0x3e, 0x4f, 0xf9, 0x5a, 0x60, 0xdc, 0x66, 0x97, 0xda, 0x1d, 0xb1,
     0xd8, 0x5e, 0x6a, 0xfb, 0xdf, 0x79, 0xb5, 0x0a, 0x24, 0x12, 0xd7, 0x54,
     0x6d, 0x5f, 0x23, 0x9f, 0xe1, 0x4f, 0xba, 0xad, 0xeb, 0x44, 0x5f, 0xc6,
@@ -38,7 +53,7 @@ const uint8_t out_u1[56] = {
     0x76, 0x62, 0x82, 0xf7, 0x3d, 0xd9, 0x6b, 0x6f
 };
 
-const uint8_t in_scalar2[56] = {
+static const uint8_t in_scalar2[56] = {
     0x20, 0x3d, 0x49, 0x44, 0x28, 0xb8, 0x39, 0x93, 0x52, 0x66, 0x5d, 0xdc,
     0xa4, 0x2f, 0x9d, 0xe8, 0xfe, 0xf6, 0x00, 0x90, 0x8e, 0x0d, 0x46, 0x1c,
     0xb0, 0x21, 0xf8, 0xc5, 0x38, 0x34, 0x5d, 0xd7, 0x7c, 0x3e, 0x48, 0x06,
@@ -46,7 +61,7 @@ const uint8_t in_scalar2[56] = {
     0x82, 0xdd, 0x2c, 0x8d, 0x5b, 0xe3, 0x09, 0x5f
 };
 
-const uint8_t in_u2[56] = {
+static const uint8_t in_u2[56] = {
     0x0f, 0xbc, 0xc2, 0xf9, 0x93, 0xcd, 0x56, 0xd3, 0x30, 0x5b, 0x0b, 0x7d,
     0x9e, 0x55, 0xd4, 0xc1, 0xa8, 0xfb, 0x5d, 0xbb, 0x52, 0xf8, 0xe9, 0xa1,
     0xe9, 0xb6, 0x20, 0x1b, 0x16, 0x5d, 0x01, 0x58, 0x94, 0xe5, 0x6c, 0x4d,
@@ -54,7 +69,7 @@ const uint8_t in_u2[56] = {
     0xdf, 0xbd, 0xe7, 0x1c, 0xe8, 0xd1, 0x57, 0xdb
 };
 
-const uint8_t out_u2[56] = {
+static const uint8_t out_u2[56] = {
     0x88, 0x4a, 0x02, 0x57, 0x62, 0x39, 0xff, 0x7a, 0x2f, 0x2f, 0x63, 0xb2,
     0xdb, 0x6a, 0x9f, 0xf3, 0x70, 0x47, 0xac, 0x13, 0x56, 0x8e, 0x1e, 0x30,
     0xfe, 0x63, 0xc4, 0xa7, 0xad, 0x1b, 0x3e, 0xe3, 0xa5, 0x70, 0x0d, 0xf3,
@@ -62,7 +77,7 @@ const uint8_t out_u2[56] = {
     0x54, 0x51, 0x4e, 0x99, 0xda, 0x7c, 0x17, 0x9d
 };
 
-const uint8_t in_u3[56] = {
+static const uint8_t in_u3[56] = {
     0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -70,40 +85,33 @@ const uint8_t in_u3[56] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-const uint8_t out_u3[3][56] = {
-    {
-     0x3f, 0x48, 0x2c, 0x8a, 0x9f, 0x19, 0xb0, 0x1e, 0x6c, 0x46, 0xee, 0x97,
-     0x11, 0xd9, 0xdc, 0x14, 0xfd, 0x4b, 0xf6, 0x7a, 0xf3, 0x07, 0x65, 0xc2,
-     0xae, 0x2b, 0x84, 0x6a, 0x4d, 0x23, 0xa8, 0xcd, 0x0d, 0xb8, 0x97, 0x08,
-     0x62, 0x39, 0x49, 0x2c, 0xaf, 0x35, 0x0b, 0x51, 0xf8, 0x33, 0x86, 0x8b,
-     0x9b, 0xc2, 0xb3, 0xbc, 0xa9, 0xcf, 0x41, 0x13}, {
-                                                       0xaa, 0x3b, 0x47, 0x49,
-                                                       0xd5, 0x5b, 0x9d, 0xaf,
-                                                       0x1e, 0x5b, 0x00, 0x28,
-                                                       0x88, 0x26, 0xc4, 0x67,
-                                                       0x27, 0x4c, 0xe3, 0xeb,
-                                                       0xbd, 0xd5, 0xc1, 0x7b,
-                                                       0x97, 0x5e, 0x09, 0xd4,
-                                                       0xaf, 0x6c, 0x67, 0xcf,
-                                                       0x10, 0xd0, 0x87, 0x20,
-                                                       0x2d, 0xb8, 0x82, 0x86,
-                                                       0xe2, 0xb7, 0x9f, 0xce,
-                                                       0xea, 0x3e, 0xc3, 0x53,
-                                                       0xef, 0x54, 0xfa, 0xa2,
-                                                       0x6e, 0x21, 0x9f, 0x38},
+static const uint8_t out_u3[3][56] = {
     {
-     0x07, 0x7f, 0x45, 0x36, 0x81, 0xca, 0xca, 0x36, 0x93, 0x19, 0x84, 0x20,
-     0xbb, 0xe5, 0x15, 0xca, 0xe0, 0x00, 0x24, 0x72, 0x51, 0x9b, 0x3e, 0x67,
-     0x66, 0x1a, 0x7e, 0x89, 0xca, 0xb9, 0x46, 0x95, 0xc8, 0xf4, 0xbc, 0xd6,
-     0x6e, 0x61, 0xb9, 0xb9, 0xc9, 0x46, 0xda, 0x8d, 0x52, 0x4d, 0xe3, 0xd6,
-     0x9b, 0xd9, 0xd9, 0xd6, 0x6b, 0x99, 0x7e, 0x37}
+        0x3f, 0x48, 0x2c, 0x8a, 0x9f, 0x19, 0xb0, 0x1e, 0x6c, 0x46, 0xee, 0x97,
+        0x11, 0xd9, 0xdc, 0x14, 0xfd, 0x4b, 0xf6, 0x7a, 0xf3, 0x07, 0x65, 0xc2,
+        0xae, 0x2b, 0x84, 0x6a, 0x4d, 0x23, 0xa8, 0xcd, 0x0d, 0xb8, 0x97, 0x08,
+        0x62, 0x39, 0x49, 0x2c, 0xaf, 0x35, 0x0b, 0x51, 0xf8, 0x33, 0x86, 0x8b,
+        0x9b, 0xc2, 0xb3, 0xbc, 0xa9, 0xcf, 0x41, 0x13
+    }, {
+        0xaa, 0x3b, 0x47, 0x49, 0xd5, 0x5b, 0x9d, 0xaf, 0x1e, 0x5b, 0x00, 0x28,
+        0x88, 0x26, 0xc4, 0x67, 0x27, 0x4c, 0xe3, 0xeb, 0xbd, 0xd5, 0xc1, 0x7b,
+        0x97, 0x5e, 0x09, 0xd4, 0xaf, 0x6c, 0x67, 0xcf, 0x10, 0xd0, 0x87, 0x20,
+        0x2d, 0xb8, 0x82, 0x86, 0xe2, 0xb7, 0x9f, 0xce, 0xea, 0x3e, 0xc3, 0x53,
+        0xef, 0x54, 0xfa, 0xa2, 0x6e, 0x21, 0x9f, 0x38
+    }, {
+        0x07, 0x7f, 0x45, 0x36, 0x81, 0xca, 0xca, 0x36, 0x93, 0x19, 0x84, 0x20,
+        0xbb, 0xe5, 0x15, 0xca, 0xe0, 0x00, 0x24, 0x72, 0x51, 0x9b, 0x3e, 0x67,
+        0x66, 0x1a, 0x7e, 0x89, 0xca, 0xb9, 0x46, 0x95, 0xc8, 0xf4, 0xbc, 0xd6,
+        0x6e, 0x61, 0xb9, 0xb9, 0xc9, 0x46, 0xda, 0x8d, 0x52, 0x4d, 0xe3, 0xd6,
+        0x9b, 0xd9, 0xd9, 0xd6, 0x6b, 0x99, 0x7e, 0x37
+    }
 };
 
 /* Test vectors from RFC8032 for Ed448 */
 
 /* Pure Ed448 */
 
-const uint8_t privkey1[57] = {
+static const uint8_t privkey1[57] = {
     0x6c, 0x82, 0xa5, 0x62, 0xcb, 0x80, 0x8d, 0x10, 0xd6, 0x32, 0xbe, 0x89,
     0xc8, 0x51, 0x3e, 0xbf, 0x6c, 0x92, 0x9f, 0x34, 0xdd, 0xfa, 0x8c, 0x9f,
     0x63, 0xc9, 0x96, 0x0e, 0xf6, 0xe3, 0x48, 0xa3, 0x52, 0x8c, 0x8a, 0x3f,
@@ -111,7 +119,7 @@ const uint8_t privkey1[57] = {
     0x03, 0x2e, 0x75, 0x49, 0xa2, 0x00, 0x98, 0xf9, 0x5b
 };
 
-const uint8_t pubkey1[57] = {
+static const uint8_t pubkey1[57] = {
     0x5f, 0xd7, 0x44, 0x9b, 0x59, 0xb4, 0x61, 0xfd, 0x2c, 0xe7, 0x87, 0xec,
     0x61, 0x6a, 0xd4, 0x6a, 0x1d, 0xa1, 0x34, 0x24, 0x85, 0xa7, 0x0e, 0x1f,
     0x8a, 0x0e, 0xa7, 0x5d, 0x80, 0xe9, 0x67, 0x78, 0xed, 0xf1, 0x24, 0x76,
@@ -119,7 +127,7 @@ const uint8_t pubkey1[57] = {
     0xd1, 0xfa, 0x1a, 0xbe, 0xaf, 0xe8, 0x25, 0x61, 0x80
 };
 
-const uint8_t sig1[114] = {
+static const uint8_t sig1[114] = {
     0x53, 0x3a, 0x37, 0xf6, 0xbb, 0xe4, 0x57, 0x25, 0x1f, 0x02, 0x3c, 0x0d,
     0x88, 0xf9, 0x76, 0xae, 0x2d, 0xfb, 0x50, 0x4a, 0x84, 0x3e, 0x34, 0xd2,
     0x07, 0x4f, 0xd8, 0x23, 0xd4, 0x1a, 0x59, 0x1f, 0x2b, 0x23, 0x3f, 0x03,
@@ -132,7 +140,7 @@ const uint8_t sig1[114] = {
     0x08, 0xff, 0x2e, 0x65, 0x26, 0x00
 };
 
-const uint8_t privkey2[57] = {
+static const uint8_t privkey2[57] = {
     0xc4, 0xea, 0xb0, 0x5d, 0x35, 0x70, 0x07, 0xc6, 0x32, 0xf3, 0xdb, 0xb4,
     0x84, 0x89, 0x92, 0x4d, 0x55, 0x2b, 0x08, 0xfe, 0x0c, 0x35, 0x3a, 0x0d,
     0x4a, 0x1f, 0x00, 0xac, 0xda, 0x2c, 0x46, 0x3a, 0xfb, 0xea, 0x67, 0xc5,
@@ -140,7 +148,7 @@ const uint8_t privkey2[57] = {
     0xf8, 0x02, 0x1e, 0x95, 0x4e, 0x0a, 0x12, 0x27, 0x4e
 };
 
-const uint8_t pubkey2[57] = {
+static const uint8_t pubkey2[57] = {
     0x43, 0xba, 0x28, 0xf4, 0x30, 0xcd, 0xff, 0x45, 0x6a, 0xe5, 0x31, 0x54,
     0x5f, 0x7e, 0xcd, 0x0a, 0xc8, 0x34, 0xa5, 0x5d, 0x93, 0x58, 0xc0, 0x37,
     0x2b, 0xfa, 0x0c, 0x6c, 0x67, 0x98, 0xc0, 0x86, 0x6a, 0xea, 0x01, 0xeb,
@@ -148,11 +156,11 @@ const uint8_t pubkey2[57] = {
     0x23, 0x51, 0x60, 0x62, 0x7b, 0x4c, 0x3a, 0x94, 0x80
 };
 
-const uint8_t msg2[1] = {
+static const uint8_t msg2[1] = {
     0x03
 };
 
-const uint8_t sig2[114] = {
+static const uint8_t sig2[114] = {
     0x26, 0xb8, 0xf9, 0x17, 0x27, 0xbd, 0x62, 0x89, 0x7a, 0xf1, 0x5e, 0x41,
     0xeb, 0x43, 0xc3, 0x77, 0xef, 0xb9, 0xc6, 0x10, 0xd4, 0x8f, 0x23, 0x35,
     0xcb, 0x0b, 0xd0, 0x08, 0x78, 0x10, 0xf4, 0x35, 0x25, 0x41, 0xb1, 0x43,
@@ -165,7 +173,7 @@ const uint8_t sig2[114] = {
     0x1c, 0xf8, 0x07, 0xc0, 0x3a, 0x00
 };
 
-const uint8_t privkey3[57] = {
+static const uint8_t privkey3[57] = {
     0xc4, 0xea, 0xb0, 0x5d, 0x35, 0x70, 0x07, 0xc6, 0x32, 0xf3, 0xdb, 0xb4,
     0x84, 0x89, 0x92, 0x4d, 0x55, 0x2b, 0x08, 0xfe, 0x0c, 0x35, 0x3a, 0x0d,
     0x4a, 0x1f, 0x00, 0xac, 0xda, 0x2c, 0x46, 0x3a, 0xfb, 0xea, 0x67, 0xc5,
@@ -173,7 +181,7 @@ const uint8_t privkey3[57] = {
     0xf8, 0x02, 0x1e, 0x95, 0x4e, 0x0a, 0x12, 0x27, 0x4e
 };
 
-const uint8_t pubkey3[57] = {
+static const uint8_t pubkey3[57] = {
     0x43, 0xba, 0x28, 0xf4, 0x30, 0xcd, 0xff, 0x45, 0x6a, 0xe5, 0x31, 0x54,
     0x5f, 0x7e, 0xcd, 0x0a, 0xc8, 0x34, 0xa5, 0x5d, 0x93, 0x58, 0xc0, 0x37,
     0x2b, 0xfa, 0x0c, 0x6c, 0x67, 0x98, 0xc0, 0x86, 0x6a, 0xea, 0x01, 0xeb,
@@ -181,15 +189,15 @@ const uint8_t pubkey3[57] = {
     0x23, 0x51, 0x60, 0x62, 0x7b, 0x4c, 0x3a, 0x94, 0x80
 };
 
-const uint8_t msg3[1] = {
+static const uint8_t msg3[1] = {
     0x03
 };
 
-const uint8_t context3[3] = {
+static const uint8_t context3[3] = {
     0x66, 0x6f, 0x6f
 };
 
-const uint8_t sig3[114] = {
+static const uint8_t sig3[114] = {
     0xd4, 0xf8, 0xf6, 0x13, 0x17, 0x70, 0xdd, 0x46, 0xf4, 0x08, 0x67, 0xd6,
     0xfd, 0x5d, 0x50, 0x55, 0xde, 0x43, 0x54, 0x1f, 0x8c, 0x5e, 0x35, 0xab,
     0xbc, 0xd0, 0x01, 0xb3, 0x2a, 0x89, 0xf7, 0xd2, 0x15, 0x1f, 0x76, 0x47,
@@ -202,7 +210,7 @@ const uint8_t sig3[114] = {
     0x37, 0x64, 0xe6, 0x6c, 0x3c, 0x00
 };
 
-const uint8_t privkey4[57] = {
+static const uint8_t privkey4[57] = {
     0xcd, 0x23, 0xd2, 0x4f, 0x71, 0x42, 0x74, 0xe7, 0x44, 0x34, 0x32, 0x37,
     0xb9, 0x32, 0x90, 0xf5, 0x11, 0xf6, 0x42, 0x5f, 0x98, 0xe6, 0x44, 0x59,
     0xff, 0x20, 0x3e, 0x89, 0x85, 0x08, 0x3f, 0xfd, 0xf6, 0x05, 0x00, 0x55,
@@ -210,7 +218,7 @@ const uint8_t privkey4[57] = {
     0xd6, 0x7e, 0x18, 0x79, 0x51, 0x26, 0x7e, 0xb3, 0x28
 };
 
-const uint8_t pubkey4[57] = {
+static const uint8_t pubkey4[57] = {
     0xdc, 0xea, 0x9e, 0x78, 0xf3, 0x5a, 0x1b, 0xf3, 0x49, 0x9a, 0x83, 0x1b,
     0x10, 0xb8, 0x6c, 0x90, 0xaa, 0xc0, 0x1c, 0xd8, 0x4b, 0x67, 0xa0, 0x10,
     0x9b, 0x55, 0xa3, 0x6e, 0x93, 0x28, 0xb1, 0xe3, 0x65, 0xfc, 0xe1, 0x61,
@@ -218,11 +226,11 @@ const uint8_t pubkey4[57] = {
     0x1d, 0x8b, 0x00, 0x69, 0x64, 0x47, 0x00, 0x14, 0x00
 };
 
-const uint8_t msg4[11] = {
+static const uint8_t msg4[11] = {
     0x0c, 0x3e, 0x54, 0x40, 0x74, 0xec, 0x63, 0xb0, 0x26, 0x5e, 0x0c
 };
 
-const uint8_t sig4[114] = {
+static const uint8_t sig4[114] = {
     0x1f, 0x0a, 0x88, 0x88, 0xce, 0x25, 0xe8, 0xd4, 0x58, 0xa2, 0x11, 0x30,
     0x87, 0x9b, 0x84, 0x0a, 0x90, 0x89, 0xd9, 0x99, 0xaa, 0xba, 0x03, 0x9e,
     0xaf, 0x3e, 0x3a, 0xfa, 0x09, 0x0a, 0x09, 0xd3, 0x89, 0xdb, 0xa8, 0x2c,
@@ -235,7 +243,7 @@ const uint8_t sig4[114] = {
     0x06, 0x49, 0x2b, 0x14, 0x0e, 0x00
 };
 
-const uint8_t privkey5[57] = {
+static const uint8_t privkey5[57] = {
     0x25, 0x8c, 0xdd, 0x4a, 0xda, 0x32, 0xed, 0x9c, 0x9f, 0xf5, 0x4e, 0x63,
     0x75, 0x6a, 0xe5, 0x82, 0xfb, 0x8f, 0xab, 0x2a, 0xc7, 0x21, 0xf2, 0xc8,
     0xe6, 0x76, 0xa7, 0x27, 0x68, 0x51, 0x3d, 0x93, 0x9f, 0x63, 0xdd, 0xdb,
@@ -243,7 +251,7 @@ const uint8_t privkey5[57] = {
     0xcb, 0x52, 0xc1, 0xc5, 0xfd, 0x2f, 0xf7, 0xe2, 0x1b
 };
 
-const uint8_t pubkey5[57] = {
+static const uint8_t pubkey5[57] = {
     0x3b, 0xa1, 0x6d, 0xa0, 0xc6, 0xf2, 0xcc, 0x1f, 0x30, 0x18, 0x77, 0x40,
     0x75, 0x6f, 0x5e, 0x79, 0x8d, 0x6b, 0xc5, 0xfc, 0x01, 0x5d, 0x7c, 0x63,
     0xcc, 0x95, 0x10, 0xee, 0x3f, 0xd4, 0x4a, 0xdc, 0x24, 0xd8, 0xe9, 0x68,
@@ -251,11 +259,11 @@ const uint8_t pubkey5[57] = {
     0xd7, 0x5e, 0x14, 0x9e, 0xf0, 0x98, 0x17, 0xf5, 0x80
 };
 
-const uint8_t msg5[12] = {
+static const uint8_t msg5[12] = {
     0x64, 0xa6, 0x5f, 0x3c, 0xde, 0xdc, 0xdd, 0x66, 0x81, 0x1e, 0x29, 0x15
 };
 
-const uint8_t sig5[114] = {
+static const uint8_t sig5[114] = {
     0x7e, 0xee, 0xab, 0x7c, 0x4e, 0x50, 0xfb, 0x79, 0x9b, 0x41, 0x8e, 0xe5,
     0xe3, 0x19, 0x7f, 0xf6, 0xbf, 0x15, 0xd4, 0x3a, 0x14, 0xc3, 0x43, 0x89,
     0xb5, 0x9d, 0xd1, 0xa7, 0xb1, 0xb8, 0x5b, 0x4a, 0xe9, 0x04, 0x38, 0xac,
@@ -268,7 +276,7 @@ const uint8_t sig5[114] = {
     0x14, 0x30, 0x64, 0xff, 0x3c, 0x00
 };
 
-const uint8_t privkey6[57] = {
+static const uint8_t privkey6[57] = {
     0x7e, 0xf4, 0xe8, 0x45, 0x44, 0x23, 0x67, 0x52, 0xfb, 0xb5, 0x6b, 0x8f,
     0x31, 0xa2, 0x3a, 0x10, 0xe4, 0x28, 0x14, 0xf5, 0xf5, 0x5c, 0xa0, 0x37,
     0xcd, 0xcc, 0x11, 0xc6, 0x4c, 0x9a, 0x3b, 0x29, 0x49, 0xc1, 0xbb, 0x60,
@@ -276,7 +284,7 @@ const uint8_t privkey6[57] = {
     0xc0, 0x26, 0x6a, 0x11, 0xa9, 0x39, 0x70, 0x10, 0x0e
 };
 
-const uint8_t pubkey6[57] = {
+static const uint8_t pubkey6[57] = {
     0xb3, 0xda, 0x07, 0x9b, 0x0a, 0xa4, 0x93, 0xa5, 0x77, 0x20, 0x29, 0xf0,
     0x46, 0x7b, 0xae, 0xbe, 0xe5, 0xa8, 0x11, 0x2d, 0x9d, 0x3a, 0x22, 0x53,
     0x23, 0x61, 0xda, 0x29, 0x4f, 0x7b, 0xb3, 0x81, 0x5c, 0x5d, 0xc5, 0x9e,
@@ -284,12 +292,12 @@ const uint8_t pubkey6[57] = {
     0x7b, 0x17, 0x4b, 0xe6, 0x5d, 0xfa, 0x57, 0x8e, 0x80
 };
 
-const uint8_t msg6[13] = {
+static const uint8_t msg6[13] = {
     0x64, 0xa6, 0x5f, 0x3c, 0xde, 0xdc, 0xdd, 0x66, 0x81, 0x1e, 0x29, 0x15,
     0xe7
 };
 
-const uint8_t sig6[114] = {
+static const uint8_t sig6[114] = {
     0x6a, 0x12, 0x06, 0x6f, 0x55, 0x33, 0x1b, 0x6c, 0x22, 0xac, 0xd5, 0xd5,
     0xbf, 0xc5, 0xd7, 0x12, 0x28, 0xfb, 0xda, 0x80, 0xae, 0x8d, 0xec, 0x26,
     0xbd, 0xd3, 0x06, 0x74, 0x3c, 0x50, 0x27, 0xcb, 0x48, 0x90, 0x81, 0x0c,
@@ -302,7 +310,7 @@ const uint8_t sig6[114] = {
     0xc7, 0x27, 0xa1, 0x05, 0x31, 0x00
 };
 
-const uint8_t privkey7[57] = {
+static const uint8_t privkey7[57] = {
     0xd6, 0x5d, 0xf3, 0x41, 0xad, 0x13, 0xe0, 0x08, 0x56, 0x76, 0x88, 0xba,
     0xed, 0xda, 0x8e, 0x9d, 0xcd, 0xc1, 0x7d, 0xc0, 0x24, 0x97, 0x4e, 0xa5,
     0xb4, 0x22, 0x7b, 0x65, 0x30, 0xe3, 0x39, 0xbf, 0xf2, 0x1f, 0x99, 0xe6,
@@ -310,7 +318,7 @@ const uint8_t privkey7[57] = {
     0xb4, 0xfa, 0x13, 0x5d, 0x55, 0x42, 0xea, 0x3f, 0x01
 };
 
-const uint8_t pubkey7[57] = {
+static const uint8_t pubkey7[57] = {
     0xdf, 0x97, 0x05, 0xf5, 0x8e, 0xdb, 0xab, 0x80, 0x2c, 0x7f, 0x83, 0x63,
     0xcf, 0xe5, 0x56, 0x0a, 0xb1, 0xc6, 0x13, 0x2c, 0x20, 0xa9, 0xf1, 0xdd,
     0x16, 0x34, 0x83, 0xa2, 0x6f, 0x8a, 0xc5, 0x3a, 0x39, 0xd6, 0x80, 0x8b,
@@ -318,7 +326,7 @@ const uint8_t pubkey7[57] = {
     0x09, 0x06, 0xcb, 0x28, 0xbd, 0x8a, 0x08, 0x1f, 0x00
 };
 
-const uint8_t msg7[64] = {
+static const uint8_t msg7[64] = {
     0xbd, 0x0f, 0x6a, 0x37, 0x47, 0xcd, 0x56, 0x1b, 0xdd, 0xdf, 0x46, 0x40,
     0xa3, 0x32, 0x46, 0x1a, 0x4a, 0x30, 0xa1, 0x2a, 0x43, 0x4c, 0xd0, 0xbf,
     0x40, 0xd7, 0x66, 0xd9, 0xc6, 0xd4, 0x58, 0xe5, 0x51, 0x22, 0x04, 0xa3,
@@ -327,7 +335,7 @@ const uint8_t msg7[64] = {
     0x1a, 0x5e, 0xf9, 0x44
 };
 
-const uint8_t sig7[114] = {
+static const uint8_t sig7[114] = {
     0x55, 0x4b, 0xc2, 0x48, 0x08, 0x60, 0xb4, 0x9e, 0xab, 0x85, 0x32, 0xd2,
     0xa5, 0x33, 0xb7, 0xd5, 0x78, 0xef, 0x47, 0x3e, 0xeb, 0x58, 0xc9, 0x8b,
     0xb2, 0xd0, 0xe1, 0xce, 0x48, 0x8a, 0x98, 0xb1, 0x8d, 0xfd, 0xe9, 0xb9,
@@ -340,7 +348,7 @@ const uint8_t sig7[114] = {
     0x9c, 0x26, 0x70, 0x83, 0x39, 0x00
 };
 
-const uint8_t privkey8[57] = {
+static const uint8_t privkey8[57] = {
     0x2e, 0xc5, 0xfe, 0x3c, 0x17, 0x04, 0x5a, 0xbd, 0xb1, 0x36, 0xa5, 0xe6,
     0xa9, 0x13, 0xe3, 0x2a, 0xb7, 0x5a, 0xe6, 0x8b, 0x53, 0xd2, 0xfc, 0x14,
     0x9b, 0x77, 0xe5, 0x04, 0x13, 0x2d, 0x37, 0x56, 0x9b, 0x7e, 0x76, 0x6b,
@@ -348,7 +356,7 @@ const uint8_t privkey8[57] = {
     0xa9, 0xce, 0xbc, 0xa9, 0x01, 0x4c, 0x63, 0x6d, 0xf5
 };
 
-const uint8_t pubkey8[57] = {
+static const uint8_t pubkey8[57] = {
     0x79, 0x75, 0x6f, 0x01, 0x4d, 0xcf, 0xe2, 0x07, 0x9f, 0x5d, 0xd9, 0xe7,
     0x18, 0xbe, 0x41, 0x71, 0xe2, 0xef, 0x24, 0x86, 0xa0, 0x8f, 0x25, 0x18,
     0x6f, 0x6b, 0xff, 0x43, 0xa9, 0x93, 0x6b, 0x9b, 0xfe, 0x12, 0x40, 0x2b,
@@ -356,7 +364,7 @@ const uint8_t pubkey8[57] = {
     0x76, 0x90, 0x86, 0x2e, 0xf3, 0xd4, 0xed, 0x3a, 0x00
 };
 
-const uint8_t msg8[256] = {
+static const uint8_t msg8[256] = {
     0x15, 0x77, 0x75, 0x32, 0xb0, 0xbd, 0xd0, 0xd1, 0x38, 0x9f, 0x63, 0x6c,
     0x5f, 0x6b, 0x9b, 0xa7, 0x34, 0xc9, 0x0a, 0xf5, 0x72, 0x87, 0x7e, 0x2d,
     0x27, 0x2d, 0xd0, 0x78, 0xaa, 0x1e, 0x56, 0x7c, 0xfa, 0x80, 0xe1, 0x29,
@@ -381,7 +389,7 @@ const uint8_t msg8[256] = {
     0x48, 0x19, 0xde, 0x11
 };
 
-const uint8_t sig8[114] = {
+static const uint8_t sig8[114] = {
     0xc6, 0x50, 0xdd, 0xbb, 0x06, 0x01, 0xc1, 0x9c, 0xa1, 0x14, 0x39, 0xe1,
     0x64, 0x0d, 0xd9, 0x31, 0xf4, 0x3c, 0x51, 0x8e, 0xa5, 0xbe, 0xa7, 0x0d,
     0x3d, 0xcd, 0xe5, 0xf4, 0x19, 0x1f, 0xe5, 0x3f, 0x00, 0xcf, 0x96, 0x65,
@@ -394,7 +402,7 @@ const uint8_t sig8[114] = {
     0x65, 0xca, 0xfe, 0x2a, 0x3d, 0x00
 };
 
-const uint8_t privkey9[57] = {
+static const uint8_t privkey9[57] = {
     0x87, 0x2d, 0x09, 0x37, 0x80, 0xf5, 0xd3, 0x73, 0x0d, 0xf7, 0xc2, 0x12,
     0x66, 0x4b, 0x37, 0xb8, 0xa0, 0xf2, 0x4f, 0x56, 0x81, 0x0d, 0xaa, 0x83,
     0x82, 0xcd, 0x4f, 0xa3, 0xf7, 0x76, 0x34, 0xec, 0x44, 0xdc, 0x54, 0xf1,
@@ -402,7 +410,7 @@ const uint8_t privkey9[57] = {
     0x9e, 0xa1, 0x65, 0xf5, 0xad, 0x55, 0xdd, 0x9c, 0xe8
 };
 
-const uint8_t pubkey9[57] = {
+static const uint8_t pubkey9[57] = {
     0xa8, 0x1b, 0x2e, 0x8a, 0x70, 0xa5, 0xac, 0x94, 0xff, 0xdb, 0xcc, 0x9b,
     0xad, 0xfc, 0x3f, 0xeb, 0x08, 0x01, 0xf2, 0x58, 0x57, 0x8b, 0xb1, 0x14,
     0xad, 0x44, 0xec, 0xe1, 0xec, 0x0e, 0x79, 0x9d, 0xa0, 0x8e, 0xff, 0xb8,
@@ -410,7 +418,7 @@ const uint8_t pubkey9[57] = {
     0xf1, 0x1c, 0xc3, 0x87, 0x37, 0x83, 0x8c, 0xf4, 0x00
 };
 
-const uint8_t msg9[1023] = {
+static const uint8_t msg9[1023] = {
     0x6d, 0xdf, 0x80, 0x2e, 0x1a, 0xae, 0x49, 0x86, 0x93, 0x5f, 0x7f, 0x98,
     0x1b, 0xa3, 0xf0, 0x35, 0x1d, 0x62, 0x73, 0xc0, 0xa0, 0xc2, 0x2c, 0x9c,
     0x0e, 0x83, 0x39, 0x16, 0x8e, 0x67, 0x54, 0x12, 0xa3, 0xde, 0xbf, 0xaf,
@@ -499,7 +507,7 @@ const uint8_t msg9[1023] = {
     0x6c, 0xba, 0x87
 };
 
-const uint8_t sig9[114] = {
+static const uint8_t sig9[114] = {
     0xe3, 0x01, 0x34, 0x5a, 0x41, 0xa3, 0x9a, 0x4d, 0x72, 0xff, 0xf8, 0xdf,
     0x69, 0xc9, 0x80, 0x75, 0xa0, 0xcc, 0x08, 0x2b, 0x80, 0x2f, 0xc9, 0xb2,
     0xb6, 0xbc, 0x50, 0x3f, 0x92, 0x6b, 0x65, 0xbd, 0xdf, 0x7f, 0x4c, 0x8f,
@@ -514,7 +522,7 @@ const uint8_t sig9[114] = {
 
 /* Prehash Ed448 */
 
-const uint8_t phprivkey1[57] = {
+static const uint8_t phprivkey1[57] = {
     0x83, 0x3f, 0xe6, 0x24, 0x09, 0x23, 0x7b, 0x9d, 0x62, 0xec, 0x77, 0x58,
     0x75, 0x20, 0x91, 0x1e, 0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b,
     0x7d, 0xa9, 0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42, 0xef, 0x78, 0x22, 0xe0,
@@ -522,7 +530,7 @@ const uint8_t phprivkey1[57] = {
     0xab, 0x2c, 0xec, 0x7c, 0x86, 0x7c, 0x6e, 0x2c, 0x49
 };
 
-const uint8_t phpubkey1[57] = {
+static const uint8_t phpubkey1[57] = {
     0x25, 0x9b, 0x71, 0xc1, 0x9f, 0x83, 0xef, 0x77, 0xa7, 0xab, 0xd2, 0x65,
     0x24, 0xcb, 0xdb, 0x31, 0x61, 0xb5, 0x90, 0xa4, 0x8f, 0x7d, 0x17, 0xde,
     0x3e, 0xe0, 0xba, 0x9c, 0x52, 0xbe, 0xb7, 0x43, 0xc0, 0x94, 0x28, 0xa1,
@@ -530,11 +538,11 @@ const uint8_t phpubkey1[57] = {
     0xd5, 0xed, 0x3d, 0x5d, 0x01, 0xc0, 0xf5, 0x38, 0x80
 };
 
-const uint8_t phmsg1[3] = {
+static const uint8_t phmsg1[3] = {
     0x61, 0x62, 0x63
 };
 
-const uint8_t phsig1[114] = {
+static const uint8_t phsig1[114] = {
     0x82, 0x2f, 0x69, 0x01, 0xf7, 0x48, 0x0f, 0x3d, 0x5f, 0x56, 0x2c, 0x59,
     0x29, 0x94, 0xd9, 0x69, 0x36, 0x02, 0x87, 0x56, 0x14, 0x48, 0x32, 0x56,
     0x50, 0x56, 0x00, 0xbb, 0xc2, 0x81, 0xae, 0x38, 0x1f, 0x54, 0xd6, 0xbc,
@@ -547,7 +555,7 @@ const uint8_t phsig1[114] = {
     0xd9, 0xd9, 0xfa, 0xb9, 0x0f, 0x00
 };
 
-const uint8_t phprivkey2[57] = {
+static const uint8_t phprivkey2[57] = {
     0x83, 0x3f, 0xe6, 0x24, 0x09, 0x23, 0x7b, 0x9d, 0x62, 0xec, 0x77, 0x58,
     0x75, 0x20, 0x91, 0x1e, 0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b,
     0x7d, 0xa9, 0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42, 0xef, 0x78, 0x22, 0xe0,
@@ -555,7 +563,7 @@ const uint8_t phprivkey2[57] = {
     0xab, 0x2c, 0xec, 0x7c, 0x86, 0x7c, 0x6e, 0x2c, 0x49
 };
 
-const uint8_t phpubkey2[57] = {
+static const uint8_t phpubkey2[57] = {
     0x25, 0x9b, 0x71, 0xc1, 0x9f, 0x83, 0xef, 0x77, 0xa7, 0xab, 0xd2, 0x65,
     0x24, 0xcb, 0xdb, 0x31, 0x61, 0xb5, 0x90, 0xa4, 0x8f, 0x7d, 0x17, 0xde,
     0x3e, 0xe0, 0xba, 0x9c, 0x52, 0xbe, 0xb7, 0x43, 0xc0, 0x94, 0x28, 0xa1,
@@ -563,15 +571,15 @@ const uint8_t phpubkey2[57] = {
     0xd5, 0xed, 0x3d, 0x5d, 0x01, 0xc0, 0xf5, 0x38, 0x80
 };
 
-const uint8_t phmsg2[3] = {
+static const uint8_t phmsg2[3] = {
     0x61, 0x62, 0x63
 };
 
-const uint8_t phcontext2[3] = {
+static const uint8_t phcontext2[3] = {
     0x66, 0x6f, 0x6f
 };
 
-const uint8_t phsig2[114] = {
+static const uint8_t phsig2[114] = {
     0xc3, 0x22, 0x99, 0xd4, 0x6e, 0xc8, 0xff, 0x02, 0xb5, 0x45, 0x40, 0x98,
     0x28, 0x14, 0xdc, 0xe9, 0xa0, 0x58, 0x12, 0xf8, 0x19, 0x62, 0xb6, 0x49,
     0xd5, 0x28, 0x09, 0x59, 0x16, 0xa2, 0xaa, 0x48, 0x10, 0x65, 0xb1, 0x58,
@@ -590,162 +598,116 @@ static const uint8_t *dohash(EVP_MD_CTX *hashctx, const uint8_t *msg,
     static uint8_t hashout[64];
 
     if (!EVP_DigestInit_ex(hashctx, EVP_shake256(), NULL)
-        || !EVP_DigestUpdate(hashctx, msg, msglen)
-        || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))
+            || !EVP_DigestUpdate(hashctx, msg, msglen)
+            || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))
         return NULL;
 
     return hashout;
 }
 
-static int test_eddsa(void)
+static int test_ed448(void)
 {
     uint8_t outsig[114];
     EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
-    int ret = 0;
 
-    if (hashctx == NULL) {
-        printf("Failed to allocate EVP_MD_CTX\n");
+    if (!TEST_ptr(hashctx)
+            || !TEST_true(ED448_sign(outsig, NULL, 0, pubkey1, privkey1, NULL,
+                                     0))
+            || !TEST_int_eq(memcmp(sig1, outsig, sizeof(sig1)), 0)
+            || !TEST_true(ED448_sign(outsig, msg2, sizeof(msg2), pubkey2,
+                                     privkey2, NULL, 0))
+            || !TEST_int_eq(memcmp(sig2, outsig, sizeof(sig2)), 0)
+            || !TEST_true(ED448_sign(outsig, msg3, sizeof(msg3), pubkey3,
+                                     privkey3, context3, sizeof(context3)))
+            || !TEST_int_eq(memcmp(sig3, outsig, sizeof(sig3)), 0)
+            || !TEST_true(ED448_sign(outsig, msg4, sizeof(msg4), pubkey4,
+                                     privkey4, NULL, 0))
+            || !TEST_int_eq(memcmp(sig4, outsig, sizeof(sig4)), 0)
+            || !TEST_true(ED448_sign(outsig, msg5, sizeof(msg5), pubkey5,
+                                     privkey5, NULL, 0))
+            || !TEST_int_eq(memcmp(sig5, outsig, sizeof(sig5)), 0)
+            || !TEST_true(ED448_sign(outsig, msg6, sizeof(msg6), pubkey6,
+                                     privkey6, NULL, 0))
+            || !TEST_int_eq(memcmp(sig6, outsig, sizeof(sig6)), 0)
+            || !TEST_true(ED448_sign(outsig, msg7, sizeof(msg7), pubkey7,
+                                     privkey7, NULL, 0))
+            || !TEST_int_eq(memcmp(sig7, outsig, sizeof(sig7)), 0)
+            || !TEST_true(ED448_sign(outsig, msg8, sizeof(msg8), pubkey8,
+                                     privkey8, NULL, 0))
+            || !TEST_int_eq(memcmp(sig8, outsig, sizeof(sig8)), 0)
+            || !TEST_true(ED448_sign(outsig, msg9, sizeof(msg9), pubkey9,
+                                     privkey9, NULL, 0))
+            || !TEST_int_eq(memcmp(sig9, outsig, sizeof(sig9)), 0)
+            || !TEST_true(ED448ph_sign(outsig, dohash(hashctx, phmsg1,
+                                       sizeof(phmsg1)), phpubkey1, phprivkey1,
+                                       NULL, 0))
+            || !TEST_int_eq(memcmp(phsig1, outsig, sizeof(phsig1)), 0)
+            || !TEST_true(ED448ph_sign(outsig, dohash(hashctx, phmsg2,
+                                       sizeof(phmsg2)), phpubkey2, phprivkey2,
+                                       phcontext2, sizeof(phcontext2)))
+            || !TEST_int_eq(memcmp(phsig2, outsig, sizeof(phsig2)), 0)) {
+        EVP_MD_CTX_free(hashctx);
         return 0;
     }
 
-    ED448_sign(outsig, NULL, 0, pubkey1, privkey1, NULL, 0);
-    if (memcmp(sig1, outsig, sizeof(sig1)) != 0) {
-        printf("Calculated sig and expected sig differ (1)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg2, sizeof(msg2), pubkey2, privkey2, NULL, 0);
-    if (memcmp(sig2, outsig, sizeof(sig2)) != 0) {
-        printf("Calculated sig and expected sig differ (2)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg3, sizeof(msg3), pubkey3, privkey3, context3,
-               sizeof(context3));
-    if (memcmp(sig3, outsig, sizeof(sig3)) != 0) {
-        printf("Calculated sig and expected sig differ (3)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg4, sizeof(msg4), pubkey4, privkey4, NULL, 0);
-    if (memcmp(sig4, outsig, sizeof(sig4)) != 0) {
-        printf("Calculated sig and expected sig differ (4)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg5, sizeof(msg5), pubkey5, privkey5, NULL, 0);
-    if (memcmp(sig5, outsig, sizeof(sig5)) != 0) {
-        printf("Calculated sig and expected sig differ (5)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg6, sizeof(msg6), pubkey6, privkey6, NULL, 0);
-    if (memcmp(sig6, outsig, sizeof(sig6)) != 0) {
-        printf("Calculated sig and expected sig differ (6)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg7, sizeof(msg7), pubkey7, privkey7, NULL, 0);
-    if (memcmp(sig7, outsig, sizeof(sig7)) != 0) {
-        printf("Calculated sig and expected sig differ (7)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg8, sizeof(msg8), pubkey8, privkey8, NULL, 0);
-    if (memcmp(sig8, outsig, sizeof(sig8)) != 0) {
-        printf("Calculated sig and expected sig differ (8)\n");
-        goto err;
-    }
-
-    ED448_sign(outsig, msg9, sizeof(msg9), pubkey9, privkey9, NULL, 0);
-    if (memcmp(sig9, outsig, sizeof(sig9)) != 0) {
-        printf("Calculated sig and expected sig differ (9)\n");
-        goto err;
-    }
-
-    ED448ph_sign(outsig, dohash(hashctx, phmsg1, sizeof(phmsg1)), phpubkey1,
-                 phprivkey1, NULL, 0);
-    if (memcmp(phsig1, outsig, sizeof(phsig1)) != 0) {
-        printf("Calculated sig and expected sig differ (ph 1)\n");
-        goto err;
-    }
-
-    ED448ph_sign(outsig, dohash(hashctx, phmsg2, sizeof(phmsg2)), phpubkey2,
-                 phprivkey2, phcontext2, sizeof(phcontext2));
-    if (memcmp(phsig2, outsig, sizeof(phsig2)) != 0) {
-        printf("Calculated sig and expected sig differ (ph 2)\n");
-        goto err;
-    }
-
-    ret = 1;
- err:
     EVP_MD_CTX_free(hashctx);
-    return ret;
+    return 1;
 }
 
-int main(int argc, char *argv[])
+static int test_x448(void)
 {
     uint8_t u[56], k[56], out[56];
-    unsigned int i, max = 1000;
+    unsigned int i;
     int j = -1;
 
-    if (argc != 1 && (argc != 2 || strcmp(argv[1], "-f") != 0)) {
-        printf("Usage: curve448_test [-f]\n");
-        return 1;
-    }
-
-    if (argc == 2)
-        max = 1000000;
-
     /* Curve448 tests */
 
-    if (!X448(out, in_scalar1, in_u1)) {
-        printf("Failed in X448 call (1)\n");
-        return 1;
-    }
-    if (memcmp(out, out_u1, sizeof(out)) != 0) {
-        printf("Calculated output and expected output differ (1)\n");
-        return 1;
-    }
-
-    if (!X448(out, in_scalar2, in_u2)) {
-        printf("Failed in X448 call (2)\n");
-        return 1;
-    }
-    if (memcmp(out, out_u2, sizeof(out)) != 0) {
-        printf("Calculated output and expected output differ (2)\n");
-        return 1;
-    }
+    if (!TEST_true(X448(out, in_scalar1, in_u1))
+          || !TEST_int_eq(memcmp(out, out_u1, sizeof(out)), 0)
+          || !TEST_true(X448(out, in_scalar2, in_u2))
+          || !TEST_int_eq(memcmp(out, out_u2, sizeof(out)), 0))
+        return 0;
 
     memcpy(u, in_u3, sizeof(u));
     memcpy(k, in_u3, sizeof(k));
     for (i = 1; i <= max; i++) {
-        if (i % 10000 == 0) {
+        if (verbose && i % 10000 == 0) {
             printf(".");
             fflush(stdout);
         }
 
-        if (!X448(out, k, u)) {
-            printf("Failed in X448 call (3, %ud)\n", i);
-            return 1;
-        }
+        if (!TEST_true(X448(out, k, u)))
+            return 0;
+
         if (i == 1 || i == 1000 || i == 1000000) {
             j++;
-            if (memcmp(out, out_u3[j], sizeof(out)) != 0) {
-                printf
-                    ("Calculated output and expected output differ (3, %ud)\n",
-                     i);
-                return 1;
+            if (!TEST_int_eq(memcmp(out, out_u3[j], sizeof(out)), 0)) {
+                TEST_info("Failed at iteration %d", i);
+                return 0;
             }
         }
         memcpy(u, k, sizeof(u));
         memcpy(k, out, sizeof(k));
     }
 
-    if (!test_eddsa())
-        return 1;
+    return 1;
+}
+
+int setup_tests(void)
+{
+    /*
+     * The test vectors contain one test which takes a very long time to run,
+     * so we don't do that be default. Using the -f option will cause it to be
+     * run.
+     */
+    if (test_has_option("-f"))
+        max = 1000000;
 
-    printf("\nSuccess!\n");
+    /* Print progress dots */
+    if (test_has_option("-v"))
+        verbose = 1;
 
-    return 0;
+    ADD_TEST(test_x448);
+    ADD_TEST(test_ed448);
+    return 1;
 }