revert more "version skew" changes that break FIPS builds

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index a5034d72c0f2d099d350f9bd33c5e30b9a919c38..710fb79baf456f6865402f2673777d9f8a86d4ef 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -58,6 +58,7 @@
 #include <openssl/objects.h>
 #include <openssl/aes.h>
 #include <openssl/sha.h>
+#include "evp_locl.h"
 
 #ifndef EVP_CIPH_FLAG_AEAD_CIPHER
 #define EVP_CIPH_FLAG_AEAD_CIPHER      0x200000

diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index 8b5175e0fdc8a3e79639cb615404c162cc614b86..b4f6bda82d4026ffabbc8d17eb8da76db5600435 100644 (file)
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -62,6 +62,7 @@
 #ifndef OPENSSL_NO_RC4
 
 #include <openssl/evp.h>
+#include "evp_locl.h"
 #include <openssl/objects.h>
 #include <openssl/rc4.h>
 

diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c
index 1e0b7c5b424ef615516110bae37ee89d4c654cab..6d47f61b274595fbe1c167abda1dfa81bdc31a45 100644 (file)
--- a/crypto/evp/m_md4.c
+++ b/crypto/evp/m_md4.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #endif
 
+#include "evp_locl.h"
+
 static int init(EVP_MD_CTX *ctx)
        { return MD4_Init(ctx->md_data); }
 

diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c
index 63c142119ebd76f6b06f0416f62e4b3efabc902e..9a8bae025803bcc220f6156ab24b131625000592 100644 (file)
--- a/crypto/evp/m_md5.c
+++ b/crypto/evp/m_md5.c
@@ -68,6 +68,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
        { return MD5_Init(ctx->md_data); }

diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
index b08d5598039316478efb565a8854ca5655f74bee..3602bed316a45e98fe429d4a4119b730607ac7dd 100644 (file)
--- a/crypto/evp/m_mdc2.c
+++ b/crypto/evp/m_mdc2.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #endif
 
+#include "evp_locl.h"
+
 static int init(EVP_MD_CTX *ctx)
        { return MDC2_Init(ctx->md_data); }
 

diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c
index a1d60ee78d281fb643901747302b4988a3dfcea7..7bf4804cf88840bb35c48a99933726803e0dace9 100644 (file)
--- a/crypto/evp/m_ripemd.c
+++ b/crypto/evp/m_ripemd.c
@@ -68,6 +68,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
        { return RIPEMD160_Init(ctx->md_data); }

diff --git a/crypto/evp/m_sha.c b/crypto/evp/m_sha.c
index acccc8f92d8e13b9cd5d50f45780f64ccc145470..8769cdd42fdae949e3e5d51f4fa78f0a08534ebe 100644 (file)
--- a/crypto/evp/m_sha.c
+++ b/crypto/evp/m_sha.c
@@ -67,6 +67,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA_Init(ctx->md_data); }

diff --git a/crypto/evp/m_wp.c b/crypto/evp/m_wp.c
index 1ce47c040bcc01fba93c972bfbbfcd467f7324eb..c51bc2d5d1eed3f355dca8e7f7a31b3fce4a4f8c 100644 (file)
--- a/crypto/evp/m_wp.c
+++ b/crypto/evp/m_wp.c
@@ -9,6 +9,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/whrlpool.h>
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
        { return WHIRLPOOL_Init(ctx->md_data); }