From: Richard Levitte <levitte@openssl.org>
Date: Thu, 20 Mar 2003 23:21:51 +0000 (+0000)
Subject: Make sure we get the definition of OPENSSL_NO_DSA and OPENSSL_NO_SHA.
X-Git-Tag: BEN_FIPS_TEST_1~38^2~229
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=751ff1d376feae3beaee90ca66dd7fe92e2316d2;p=oweals%2Fopenssl.git

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 6ba79b01df..651add43ae 100644
--- 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 4b9aff3689..dffd588ff1 100644
--- 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 48ff1f423c..8427b77970 100644
--- 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 940d97d0e6..71ff566edb 100644
--- 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