diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2005-10-14 05:41:48 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2005-10-14 05:41:48 +0000 |
| commit | d00a42c5af6c1df0f880351a2feedea7731e2020 (patch) | |
| tree | 0db9eef04a4e3778095ea16319c0fed37db448d4 /security | |
| parent | Upgrade to 2.6.2. (diff) | |
- binary compatability patch
PR: 87419
Submitted by: Phil Oleson
Notes
Notes:
svn path=/head/; revision=145331
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 2 | ||||
| -rw-r--r-- | security/openssl/files/patch-evp.h | 14 | ||||
| -rw-r--r-- | security/openssl/files/patch-hmac.h | 14 |
3 files changed, 29 insertions, 1 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index f17ba6c31da5..4c18ebdff46e 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -12,7 +12,7 @@ PORTREVISION!= date -v-1d +%Y%m%d .else .if !defined(WITH_OPENSSL_BETA) && defined(WITH_OPENSSL_097) PORTVERSION= 0.9.7h -PORTREVISION?= 0 +PORTREVISION?= 1 .else PORTVERSION= 0.9.8a PORTREVISION?= 0 diff --git a/security/openssl/files/patch-evp.h b/security/openssl/files/patch-evp.h new file mode 100644 index 000000000000..dabadea299e4 --- /dev/null +++ b/security/openssl/files/patch-evp.h @@ -0,0 +1,14 @@ +--- crypto/evp/evp.h.orig Thu Oct 13 17:24:41 2005 ++++ crypto/evp/evp.h Thu Oct 13 17:26:32 2005 +@@ -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 EVP_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/security/openssl/files/patch-hmac.h b/security/openssl/files/patch-hmac.h new file mode 100644 index 000000000000..dab469e67b67 --- /dev/null +++ b/security/openssl/files/patch-hmac.h @@ -0,0 +1,14 @@ +--- crypto/hmac/hmac.h.orig Thu Oct 13 17:27:32 2005 ++++ crypto/hmac/hmac.h Thu Oct 13 17:28:43 2005 +@@ -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" { |