Retain binary compatibility between 0.9.7h and 0.9.7g.

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 058dae09088496598cbc0d72362609ba33c8249b..63e6b2d5194e0924de303ab46aa1936b60ebb5ec 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -132,7 +132,11 @@
 #define EVP_CAST5_KEY_SIZE             16
 #define EVP_RC5_32_12_16_KEY_SIZE      16
 */
+#ifdef OPENSSL_FIPS
 #define EVP_MAX_MD_SIZE                        64      /* longest known SHA512 */
+#else
+#define EXP_MAX_MD_SIZE                        (16+20) /* The SSLv3 md5+sha1 type */
+#endif
 #define EVP_MAX_KEY_LENGTH             32
 #define EVP_MAX_IV_LENGTH              16
 #define EVP_MAX_BLOCK_LENGTH           32

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 8f3d7e54faca6847e4a0f66a19eff0cc51fe80e2..c6489c04c85b0856f779c7b9a7b6be51d46a10bb 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -64,7 +64,11 @@
 
 #include <openssl/evp.h>
 
+#ifdef OPENSSL_FIPS
 #define HMAC_MAX_MD_CBLOCK     128
+#else
+#define HMAC_MAX_MD_CBLOCK     64
+#endif
 
 #ifdef  __cplusplus
 extern "C" {