[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  1297ef9928e0b77b1ca81b5aafa47f5b25c247a7 (commit)
      from  b5319bdbd095ff59d084af5ce16e5f715963557d (commit)


- Log -----------------------------------------------------------------
commit 1297ef9928e0b77b1ca81b5aafa47f5b25c247a7
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Jun 30 19:55:47 2017 +0100

    Fix build with no-threads no-ec
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3817)

-----------------------------------------------------------------------

Summary of changes:
 crypto/threads_none.c | 1 +
 test/ecdsatest.c      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 39aadd0..1fc2f0f 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -8,6 +8,7 @@
  */
 
 #include <openssl/crypto.h>
+#include <internal/cryptlib.h>
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 8a245b5..ef3f54c 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -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