Make sure we get the definition of OPENSSL_NO_DSA and OPENSSL_NO_SHA.

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 6ba79b01dfe853d6cb2ecd6100b13cb3a918c1c5..651add43ae3e417fb33ac52011a92803f9dab8e2 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -65,6 +65,8 @@
 #ifndef HEADER_DSA_H
 #define HEADER_DSA_H
 
+#include <openssl/e_os2.h>
+
 #ifdef OPENSSL_NO_DSA
 #error DSA is disabled.
 #endif

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 4b9aff3689c55d4b4a2dc46ee2c3914ff23a445e..dffd588ff1c441b79f8ba61775566a7b02ab026d 100644 (file)
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -69,6 +69,8 @@
 #define HASH    EVP_sha1()
 #endif 
 
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_SHA is defined */
+
 #ifndef OPENSSL_NO_SHA
 
 #include <stdio.h>

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 48ff1f423cf09300cd62065579dcff237a5244df..8427b77970dafa066bdc5ee810380013423fb54a 100644 (file)
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -56,10 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_SHA
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
+#ifndef OPENSSL_NO_SHA
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/rand.h>

diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 940d97d0e6c286333df8733579498cd2911a6164..71ff566edb8a894ad157ad7d85f1e5e671dcca1f 100644 (file)
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -76,6 +76,7 @@
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#include <openssl/e_os2.h>
 #endif
 
 #ifdef OPENSSL_NO_DSA