diff options
Diffstat (limited to 'src/lib/libssl/src/crypto/evp/evp.h')
| -rw-r--r-- | src/lib/libssl/src/crypto/evp/evp.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h index 5cde88ae76..56eec23fef 100644 --- a/src/lib/libssl/src/crypto/evp/evp.h +++ b/src/lib/libssl/src/crypto/evp/evp.h | |||
| @@ -84,7 +84,11 @@ | |||
| 84 | #include <openssl/md5.h> | 84 | #include <openssl/md5.h> |
| 85 | #endif | 85 | #endif |
| 86 | #ifndef OPENSSL_NO_SHA | 86 | #ifndef OPENSSL_NO_SHA |
| 87 | #ifndef OPENSSL_FIPS | ||
| 87 | #include <openssl/sha.h> | 88 | #include <openssl/sha.h> |
| 89 | #else | ||
| 90 | #include <openssl/fips_sha.h> | ||
| 91 | #endif | ||
| 88 | #endif | 92 | #endif |
| 89 | #ifndef OPENSSL_NO_RIPEMD | 93 | #ifndef OPENSSL_NO_RIPEMD |
| 90 | #include <openssl/ripemd.h> | 94 | #include <openssl/ripemd.h> |
| @@ -128,7 +132,11 @@ | |||
| 128 | #define EVP_CAST5_KEY_SIZE 16 | 132 | #define EVP_CAST5_KEY_SIZE 16 |
| 129 | #define EVP_RC5_32_12_16_KEY_SIZE 16 | 133 | #define EVP_RC5_32_12_16_KEY_SIZE 16 |
| 130 | */ | 134 | */ |
| 131 | #define EVP_MAX_MD_SIZE (16+20) /* The SSLv3 md5+sha1 type */ | 135 | #ifdef OPENSSL_FIPS |
| 136 | #define EVP_MAX_MD_SIZE 64 /* longest known SHA512 */ | ||
| 137 | #else | ||
| 138 | #define EVP_MAX_MD_SIZE (16+20) /* The SSLv3 md5+sha1 type */ | ||
| 139 | #endif | ||
| 132 | #define EVP_MAX_KEY_LENGTH 32 | 140 | #define EVP_MAX_KEY_LENGTH 32 |
| 133 | #define EVP_MAX_IV_LENGTH 16 | 141 | #define EVP_MAX_IV_LENGTH 16 |
| 134 | #define EVP_MAX_BLOCK_LENGTH 32 | 142 | #define EVP_MAX_BLOCK_LENGTH 32 |
| @@ -642,6 +650,16 @@ const EVP_MD *EVP_sha(void); | |||
| 642 | const EVP_MD *EVP_sha1(void); | 650 | const EVP_MD *EVP_sha1(void); |
| 643 | const EVP_MD *EVP_dss(void); | 651 | const EVP_MD *EVP_dss(void); |
| 644 | const EVP_MD *EVP_dss1(void); | 652 | const EVP_MD *EVP_dss1(void); |
| 653 | #ifdef OPENSSL_FIPS | ||
| 654 | #ifndef OPENSSL_NO_SHA256 | ||
| 655 | const EVP_MD *EVP_sha224(void); | ||
| 656 | const EVP_MD *EVP_sha256(void); | ||
| 657 | #endif | ||
| 658 | #ifndef OPENSSL_NO_SHA512 | ||
| 659 | const EVP_MD *EVP_sha384(void); | ||
| 660 | const EVP_MD *EVP_sha512(void); | ||
| 661 | #endif | ||
| 662 | #endif | ||
| 645 | #endif | 663 | #endif |
| 646 | #ifndef OPENSSL_NO_MDC2 | 664 | #ifndef OPENSSL_NO_MDC2 |
| 647 | const EVP_MD *EVP_mdc2(void); | 665 | const EVP_MD *EVP_mdc2(void); |
