From: Andy Polyakov <appro@openssl.org>
Date: Tue, 11 Oct 2005 19:12:24 +0000 (+0000)
Subject: Retain binary compatibility between 0.9.7h and 0.9.7g.
X-Git-Tag: OpenSSL_0_9_7i~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c892524146b3b506f1d0d76d3571fb783dd618ec;p=oweals%2Fopenssl.git

Retain binary compatibility between 0.9.7h and 0.9.7g.
---

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 058dae0908..63e6b2d519 100644
--- 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 8f3d7e54fa..c6489c04c8 100644
--- 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" {