From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 21 Sep 2008 11:40:36 +0000 (+0000)
Subject: Fix warnings when more pedantic "debuge-steve32" target is used.
X-Git-Tag: OpenSSL_0_9_8j~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=155ad6d2190827465198221237a4009c410ec0b4;p=oweals%2Fopenssl.git

Fix warnings when more pedantic "debuge-steve32" target is used.
---

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 2ae3a9889b..c0806d593c 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -63,11 +63,11 @@
  * 1.1 added norm_expand_bits
  * 1.0 First working version
  */
+#include "des_locl.h"
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
 #endif
 
-#include "des_locl.h"
 
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);	/* defaults to false */
 
diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 1ba9d85db4..743558ab33 100644
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -234,8 +234,8 @@ padlock_bind_fn(ENGINE *e, const char *id)
 	return 1;
 }
 
-IMPLEMENT_DYNAMIC_CHECK_FN ();
-IMPLEMENT_DYNAMIC_BIND_FN (padlock_bind_fn);
+IMPLEMENT_DYNAMIC_CHECK_FN ()
+IMPLEMENT_DYNAMIC_BIND_FN (padlock_bind_fn)
 #endif /* DYNAMIC_ENGINE */
 
 /* ===== Here comes the "real" engine ===== */
diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index ff7478044a..9ce613b96d 100644
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -65,6 +65,7 @@
 #include <ctype.h>
 #include <openssl/aes.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #include <openssl/err.h>
 #include "e_os.h"
diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index c0de11bd7b..2d3424cf9f 100644
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -66,6 +66,7 @@
 #include <ctype.h>
 #include <openssl/des.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #include <openssl/err.h>
 #include "e_os.h"
diff --git a/fips/dh/fips_dh_lib.c b/fips/dh/fips_dh_lib.c
index 692f6b792f..93ff60452d 100644
--- a/fips/dh/fips_dh_lib.c
+++ b/fips/dh/fips_dh_lib.c
@@ -57,7 +57,8 @@
  */
 
 #include <string.h>
-#include <openssl/dsa.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 /* Minimal FIPS versions of FIPS_dh_new() and FIPS_dh_free(): to
  * reduce external dependencies. 
diff --git a/fips/dsa/fips_dsa_lib.c b/fips/dsa/fips_dsa_lib.c
index 12f0badb99..8af5f3b6f8 100644
--- a/fips/dsa/fips_dsa_lib.c
+++ b/fips/dsa/fips_dsa_lib.c
@@ -58,6 +58,7 @@
 
 #include <string.h>
 #include <openssl/dsa.h>
+#include <openssl/bn.h>
 
 /* Minimal FIPS versions of FIPS_dsa_new() and FIPS_dsa_free: to
  * reduce external dependencies. 
diff --git a/fips/dsa/fips_dsa_ossl.c b/fips/dsa/fips_dsa_ossl.c
index 6e3747a205..50a6c13318 100644
--- a/fips/dsa/fips_dsa_ossl.c
+++ b/fips/dsa/fips_dsa_ossl.c
@@ -63,6 +63,7 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
+#include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/fips/dsa/fips_dsa_selftest.c b/fips/dsa/fips_dsa_selftest.c
index 6ff114e6b2..6880760a77 100644
--- a/fips/dsa/fips_dsa_selftest.c
+++ b/fips/dsa/fips_dsa_selftest.c
@@ -62,6 +62,7 @@
 #include <openssl/fips.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #ifdef OPENSSL_FIPS
 
diff --git a/fips/dsa/fips_dsa_sign.c b/fips/dsa/fips_dsa_sign.c
index 1707ff39b2..49e3894c32 100644
--- a/fips/dsa/fips_dsa_sign.c
+++ b/fips/dsa/fips_dsa_sign.c
@@ -61,6 +61,7 @@
 #include <openssl/dsa.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
+#include <openssl/bn.h>
 
 #ifdef OPENSSL_FIPS
 
diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index 2729a98f17..c7e0f5164f 100644
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -69,6 +69,8 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/dsa.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index 2d9de5f6a6..78a15b7758 100644
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -20,6 +20,7 @@
 #include <openssl/des.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
+#include <openssl/dh.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 
diff --git a/fips/hmac/fips_hmactest.c b/fips/hmac/fips_hmactest.c
index d02a38f826..e59478faca 100644
--- a/fips/hmac/fips_hmactest.c
+++ b/fips/hmac/fips_hmactest.c
@@ -63,6 +63,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/bn.h>
 
 #include <openssl/x509v3.h>
 
diff --git a/fips/rsa/fips_rsa_lib.c b/fips/rsa/fips_rsa_lib.c
index c135539f8b..cfdb7f3f04 100644
--- a/fips/rsa/fips_rsa_lib.c
+++ b/fips/rsa/fips_rsa_lib.c
@@ -59,6 +59,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/err.h>
 
 /* Minimal FIPS versions of FIPS_rsa_new() and FIPS_rsa_free: to
diff --git a/fips/rsa/fips_rsa_selftest.c b/fips/rsa/fips_rsa_selftest.c
index eecfb60312..bead61f572 100644
--- a/fips/rsa/fips_rsa_selftest.c
+++ b/fips/rsa/fips_rsa_selftest.c
@@ -52,6 +52,7 @@
 #include <openssl/fips.h>
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 #include <openssl/opensslconf.h>
 
 #ifdef OPENSSL_FIPS
diff --git a/fips/rsa/fips_rsagtest.c b/fips/rsa/fips_rsagtest.c
index 0ae2a29335..116a104cd5 100644
--- a/fips/rsa/fips_rsagtest.c
+++ b/fips/rsa/fips_rsagtest.c
@@ -63,6 +63,8 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS
diff --git a/fips/rsa/fips_rsastest.c b/fips/rsa/fips_rsastest.c
index cca1a27cc9..1a6b1689c0 100644
--- a/fips/rsa/fips_rsastest.c
+++ b/fips/rsa/fips_rsastest.c
@@ -63,6 +63,8 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS
diff --git a/fips/rsa/fips_rsavtest.c b/fips/rsa/fips_rsavtest.c
index 13dc09a03f..8d8fbab7fa 100644
--- a/fips/rsa/fips_rsavtest.c
+++ b/fips/rsa/fips_rsavtest.c
@@ -64,6 +64,8 @@
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
 
 #ifndef OPENSSL_FIPS
 
diff --git a/fips/sha/fips_shatest.c b/fips/sha/fips_shatest.c
index 6726116a2f..22458c5358 100644
--- a/fips/sha/fips_shatest.c
+++ b/fips/sha/fips_shatest.c
@@ -62,6 +62,7 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS