diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-06-27 05:07:04 +0000 |
| commit | 0fa0c9fb7d6f4ad7a423044f28b55eaaedc63f28 (patch) | |
| tree | 98d6947cd8474ab98b57494ebef50e97659be043 /lib/libcrypto/evp/evp.h | |
| parent | ecc645c71513728e7357c84aa8997b4dc2301936 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/evp.h')
| -rw-r--r-- | lib/libcrypto/evp/evp.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h index 09e597f631b..f29e0ba8f00 100644 --- a/lib/libcrypto/evp/evp.h +++ b/lib/libcrypto/evp/evp.h @@ -86,7 +86,7 @@ #define EVP_CAST5_KEY_SIZE 16 #define EVP_RC5_32_12_16_KEY_SIZE 16 */ -#define EVP_MAX_MD_SIZE 64 /* to fit SHA512 */ +#define EVP_MAX_MD_SIZE 64 /* longest known SHA512 */ #define EVP_MAX_KEY_LENGTH 32 #define EVP_MAX_IV_LENGTH 16 #define EVP_MAX_BLOCK_LENGTH 32 @@ -589,6 +589,16 @@ const EVP_MD *EVP_sha(void); const EVP_MD *EVP_sha1(void); const EVP_MD *EVP_dss(void); const EVP_MD *EVP_dss1(void); +#ifdef OPENSSL_FIPS +#ifndef OPENSSL_NO_SHA256 +const EVP_MD *EVP_sha224(void); +const EVP_MD *EVP_sha256(void); +#endif +#ifndef OPENSSL_NO_SHA512 +const EVP_MD *EVP_sha384(void); +const EVP_MD *EVP_sha512(void); +#endif +#endif #endif #ifndef OPENSSL_NO_MDC2 const EVP_MD *EVP_mdc2(void); |