Fix build with no-threads no-ec
authorDr. Stephen Henson <steve@openssl.org>
Fri, 30 Jun 2017 18:55:47 +0000 (19:55 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 30 Jun 2017 18:55:47 +0000 (19:55 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3817)

crypto/threads_none.c
test/ecdsatest.c

index 39aadd0e9811dd3637ee5adca68f57a9b0d4ae49..1fc2f0fe6c80b9f70d9396bb5563c17900c34782 100644 (file)
@@ -8,6 +8,7 @@
  */
 
 #include <openssl/crypto.h>
+#include <internal/cryptlib.h>
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
index 8a245b5d7421870faaee0c2ac0ac0a765c0584b7..ef3f54ca4e7dc64091e17679e21bd0c5643e611c 100644 (file)
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_EC is defined */
+# include "testutil.h"
 
 #ifndef OPENSSL_NO_EC
 
@@ -26,7 +27,6 @@
 # endif
 # include <openssl/err.h>
 # include <openssl/rand.h>
-# include "testutil.h"
 
 static const char rnd_seed[] =
     "string to make the random number generator think it has randomness";
@@ -394,6 +394,7 @@ static int test_builtin(void)
 
     return ret;
 }
+#endif
 
 void register_tests(void)
 {
@@ -406,4 +407,3 @@ void register_tests(void)
     ADD_TEST(test_builtin);
 #endif
 }
-#endif