Update some nits around the FIPS module

[openssl.git] / test / ssl_cert_table_internal_test.c

diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 0fa5e4e214a80608b8a45e26564923d5e700e9bb..d6e93af5b67371bc189353bd117d7e221b4c09a7 100644 (file)
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2018 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,10 @@
 
 #include <openssl/ssl.h>
 #include "testutil.h"
-#include "e_os.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
-#include "../ssl/ssl_locl.h"
+#include "internal/nelem.h"
+#include "../ssl/ssl_local.h"
 #include "../ssl/ssl_cert_table.h"
 
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #define test_cert_table(nid, amask, idx) \
     do_test_cert_table(nid, amask, idx, #idx)
 
@@ -51,7 +41,7 @@ static int do_test_cert_table(int nid, uint32_t amask, size_t idx,
 
 /* Sanity check of ssl_cert_table */
 
-static int test_ssl_cert_table()
+static int test_ssl_cert_table(void)
 {
     TEST_size_t_eq(OSSL_NELEM(ssl_cert_info), SSL_PKEY_NUM);
     if (!test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA))
@@ -70,11 +60,14 @@ static int test_ssl_cert_table()
         return 0;
     if (!test_cert_table(EVP_PKEY_ED25519, SSL_aECDSA, SSL_PKEY_ED25519))
         return 0;
+    if (!test_cert_table(EVP_PKEY_ED448, SSL_aECDSA, SSL_PKEY_ED448))
+        return 0;
 
     return 1;
 }
 
-void register_tests()
+int setup_tests(void)
 {
     ADD_TEST(test_ssl_cert_table);
+    return 1;
 }