summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2007-05-01 19:51:26 +0200
committerJeremy Blosser2007-05-01 13:27:00 -0500
commit70622d0782a9666579d00eeabb07f89275b75a4b (patch)
treea042b963a1a5840bce456ea2460c7689dacbfb1b
parentad23f28353e1b1bd3a7be69a040c5f78f7a00933 (diff)
openssl: applied upstream patch [Bug 13750]
(cherry picked from commit a0d2840128a713905c900fe2b0090f6d31e040dc)
-rwxr-xr-xcrypto/openssl/DETAILS1
-rw-r--r--crypto/openssl/HISTORY4
-rwxr-xr-xcrypto/openssl/PRE_BUILD4
-rw-r--r--crypto/openssl/evp_lib.c.diff11
4 files changed, 20 insertions, 0 deletions
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 3e3a9f2ac9..6fb02663ed 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,6 @@
SPELL=openssl
VERSION=0.9.8e
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 8636a84eea..443f8db1d2 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2007-05-01 Ladislav Hagara <hgr@vabo.cz>
+ * PRE_BUILD, evp_lib.c.diff: applied upstream patch [Bug 13750]
+ * DETAILS: PATCHLEVEL=1
+
2007-02-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.8e
diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD
new file mode 100755
index 0000000000..1141bcf00d
--- /dev/null
+++ b/crypto/openssl/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch crypto/evp/evp_lib.c < $SPELL_DIRECTORY/evp_lib.c.diff
diff --git a/crypto/openssl/evp_lib.c.diff b/crypto/openssl/evp_lib.c.diff
new file mode 100644
index 0000000000..416e77df3e
--- /dev/null
+++ b/crypto/openssl/evp_lib.c.diff
@@ -0,0 +1,11 @@
+--- evp_lib.c 2006/11/29 20:47:13 1.10.2.1
++++ evp_lib.c 2007/02/27 18:42:52 1.10.2.2
+@@ -225,7 +225,7 @@
+
+ int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
+ {
+- return ctx->cipher->key_len;
++ return ctx->key_len;
+ }
+
+ int EVP_CIPHER_nid(const EVP_CIPHER *cipher)