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 2ae3a9889bc47301c85faf4fa82a9736f4c24604..c0806d593c1fcf09e8b2456fdba380d13830eaad 100644 (file)
--- 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 1ba9d85db4575095157852b0612598b4e4520c41..743558ab3360515803226589cca616390f2157ed 100644 (file)
--- 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 ff7478044a0b63c59645ea07ae64d641fe003069..9ce613b96dffd477f45894f8477775921a0f1f84 100644 (file)
--- 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 c0de11bd7b1b39998c5c24bd7f89b1ac58c842ac..2d3424cf9f825061e61679399d11f272b7184934 100644 (file)
--- 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 692f6b792ff0c11b70ba0636b96011900210fcf1..93ff60452dbd38604f3021044009d4069b4798fd 100644 (file)
--- 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 12f0badb99ac0ff5d40ab1a523371e8ed1663260..8af5f3b6f8cc2f0d7d4805942379f0fc93917fc8 100644 (file)
--- 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 6e3747a205d93d48dd053026b8b14d8eaccbd903..50a6c133185f17264f0f810525cb95d626da140d 100644 (file)
--- 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 6ff114e6b2ea2ef72493fb86376c143d614839d5..6880760a772bbf568745794750f62c6239c21ac9 100644 (file)
--- 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 1707ff39b2812208ef155e41ecdc8ed242bff0ba..49e3894c32f8d74a3141ab43c06072347121347a 100644 (file)
--- 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 2729a98f17a368f68a3e704896572fb9bffa3554..c7e0f5164f2bf9eaaf64162b180b678feb81ea13 100644 (file)
--- 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 2d9de5f6a6a9dd363617d16e80bc3a1524b34fea..78a15b7758f55be163299e6c9a559bf9aa090b05 100644 (file)
--- 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 d02a38f82652ea2fffa64ce151e9bd5893bfb65a..e59478faca930ebaa54e572f1275fdf54adbdc9c 100644 (file)
--- 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 c135539f8b7a1d9ecfff29b440efbc71c6cf14a6..cfdb7f3f042f77e42a410246d3ec920ee41b34f2 100644 (file)
--- 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 eecfb60312ad7947fe50eb116c6b266a39fb901c..bead61f572b3c190adf1d118976527d202dd44ee 100644 (file)
--- 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 0ae2a293352df25324d23ca310bc96e900dd3259..116a104cd5ca16378ed890809cc12790b9aa2030 100644 (file)
--- 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 cca1a27cc9ea47694cd7e16244af41d18c5cf754..1a6b1689c07c0316f37feca571091f5bcfb99b87 100644 (file)
--- 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 13dc09a03f66501242bba777138045514b57759b..8d8fbab7faeb30b3a8e6037b6fa78f8da2be736e 100644 (file)
--- 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 6726116a2fe4840204082c8851ac8b6c20161790..22458c5358d2186a481a744867641e2784023159 100644 (file)
--- 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