X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=test%2Fssl_cert_table_internal_test.c;h=bba4e441cbfd19de22e5e9c0d7d27a3a2c95b0cd;hb=18289399743da6c3db462f37fc8797738e8acf7c;hp=e9529c63453be9e21cc26952503f4e8fabd02c64;hpb=ad887416f1e59c3294a7d8f83a0ca77120523b4a;p=openssl.git diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c index e9529c6345..bba4e441cb 100644 --- a/test/ssl_cert_table_internal_test.c +++ b/test/ssl_cert_table_internal_test.c @@ -1,5 +1,5 @@ /* - * 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 * this file except in compliance with the License. You can obtain a copy @@ -14,20 +14,10 @@ #include #include "testutil.h" -#include "e_os.h" - -#ifdef __VMS -# pragma names save -# pragma names as_is,shortened -#endif - +#include "internal/nelem.h" #include "../ssl/ssl_locl.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,13 @@ 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; } -int setup_tests() +int setup_tests(void) { ADD_TEST(test_ssl_cert_table); return 1;