diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-06-10 23:01:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-06-10 23:01:28 +0000 |
| commit | 58fdd30664c4709bacee62984de017b2ccf388f3 (patch) | |
| tree | a9b6d4d2027742e264958b597dc85564283326c9 | |
| parent | 7175dbaeba1dbcb176b63894f8a41e4f4b3e54d7 (diff) | |
revert more "version skew" changes that break FIPS builds
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 1 | ||||
| -rw-r--r-- | crypto/evp/e_rc4.c | 1 | ||||
| -rw-r--r-- | crypto/evp/m_md4.c | 2 | ||||
| -rw-r--r-- | crypto/evp/m_md5.c | 1 | ||||
| -rw-r--r-- | crypto/evp/m_mdc2.c | 2 | ||||
| -rw-r--r-- | crypto/evp/m_ripemd.c | 1 | ||||
| -rw-r--r-- | crypto/evp/m_sha.c | 1 | ||||
| -rw-r--r-- | crypto/evp/m_wp.c | 1 |
8 files changed, 10 insertions, 0 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index a5034d72c0..710fb79baf 100644 --- 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 8b5175e0fd..b4f6bda82d 100644 --- 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 1e0b7c5b42..6d47f61b27 100644 --- 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 63c142119e..9a8bae0258 100644 --- 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 b08d559803..3602bed316 100644 --- 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 a1d60ee78d..7bf4804cf8 100644 --- 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 acccc8f92d..8769cdd42f 100644 --- 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 1ce47c040b..c51bc2d5d1 100644 --- 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); } |