diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-01 13:39:45 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-01 13:39:45 +0000 |
| commit | 65300dcfb04bae643ea7b8f42ff8c8f1b1210a9e (patch) | |
| tree | b3cebcf5d9b7c05745dcd26cc13de2805098c224 /crypto/evp | |
| parent | 9ddc574f9aed0fbf5b19c50a495de608550174c7 (diff) | |
Prohibit use of low level digest APIs in FIPS mode.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_locl.h | 15 | ||||
| -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 |
7 files changed, 23 insertions, 0 deletions
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index 292d74c188..1620eb714a 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -343,3 +343,18 @@ struct evp_pkey_method_st } /* EVP_PKEY_METHOD */; void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); + +#ifdef OPENSSL_FIPS +#define RIPEMD160_Init private_RIPEMD160_Init +#define WHIRLPOOL_Init private_WHIRLPOOL_Init +#define MD5_Init private_MD5_Init +#define MD4_Init private_MD4_Init +#define MD2_Init private_MD2_Init +#define MDC2_Init private_MDC2_Init +#define SHA_Init private_SHA_Init +#define SHA1_Init private_SHA1_Init +#define SHA224_Init private_SHA224_Init +#define SHA256_Init private_SHA256_Init +#define SHA384_Init private_SHA384_Init +#define SHA512_Init private_SHA512_Init +#endif 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); } |