X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fecdsatest.c;h=e53afdf33b264e9822bf0b9a8478f4d0a7e682e4;hp=841934e51c69e544d8247aaa41dc30c9aad7bacf;hb=0ca3aea7d359144681d591eb53961ec915c8de8e;hpb=a69de3f2014ab55329f43633714c9c153cb5cb30 diff --git a/test/ecdsatest.c b/test/ecdsatest.c index 841934e51c..e53afdf33b 100644 --- a/test/ecdsatest.c +++ b/test/ecdsatest.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -13,6 +13,7 @@ #include #include /* To see if OPENSSL_NO_EC is defined */ +# include "testutil.h" #ifndef OPENSSL_NO_EC @@ -26,11 +27,6 @@ # endif # include # include -# include "testutil.h" - -static const char rnd_seed[] = "string to make the random number generator " - "think it has entropy"; - /* functions to change the RAND_METHOD */ static int fbytes(unsigned char *buf, int num); @@ -169,7 +165,7 @@ static int x9_62_test_internal(int nid, const char *r_in, const char *s_in) return ret; } -static int x9_62_tests() +static int x9_62_tests(void) { int ret = 0; @@ -394,16 +390,15 @@ static int test_builtin(void) return ret; } +#endif -void register_tests(void) +int setup_tests(void) { #ifdef OPENSSL_NO_EC TEST_note("Elliptic curves are disabled."); #else - /* initialize the prng */ - RAND_seed(rnd_seed, sizeof(rnd_seed)); ADD_TEST(x9_62_tests); ADD_TEST(test_builtin); #endif + return 1; } -#endif