From 719bf22619539aab9505a9fbb549826574186a39 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 19 Jul 2005 13:52:07 +0000
Subject: [PATCH] Clifford Wolf: 	Fixed wvstreams for new OpenSSL
 library

[2005071914292120543] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6240 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/esden/wvstreams/openssl-hotfix.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/esden/wvstreams/openssl-hotfix.patch

diff --git a/package/esden/wvstreams/openssl-hotfix.patch b/package/esden/wvstreams/openssl-hotfix.patch
new file mode 100644
index 000000000..05c7acae6
--- /dev/null
+++ b/package/esden/wvstreams/openssl-hotfix.patch
@@ -0,0 +1,36 @@
+--- ./crypto/wvx509.cc.orig	2004-11-18 15:15:05.000000000 +0100
++++ ./crypto/wvx509.cc	2005-07-19 14:35:09.000000000 +0200
+@@ -1162,12 +1162,19 @@
+ 		else
+ 		{
+ 		    void *ext_data = NULL;
++#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
++                   const unsigned char **ext_value_data;
++                   ext_value_data = (const_cast<const unsigned char **>
++                                     (&ext->value->data));
++#else
++                   unsigned char **ext_value_data = &ext->value->data;
++#endif
+ 		    if (method->it) 
+-			ext_data = ASN1_item_d2i(NULL, &ext->value->data, 
++                       ext_data = ASN1_item_d2i(NULL, ext_value_data,
+ 						ext->value->length, 
+ 						ASN1_ITEM_ptr(method->it));
+ 		    else
+-			ext_data = method->d2i(NULL, &ext->value->data, 
++                       ext_data = method->d2i(NULL, ext_value_data,
+ 					      ext->value->length);
+ 		    
+ 		    if (method->i2s)
+--- ./crypto/wvtripledes.cc.orig	2004-11-18 15:15:05.000000000 +0100
++++ ./crypto/wvtripledes.cc	2005-07-19 14:35:09.000000000 +0200
+@@ -102,7 +102,8 @@
+ 	// ECB works 64bits at a time
+ 	while (len >= 8)
+ 	{
+-#if OPENSSL_VERSION_NUMBER >= 0x0090705FL
++#if OPENSSL_VERSION_NUMBER >= 0x0090705fL \
++    && OPENSSL_VERSION_NUMBER < 0x0090800fL
+ 	    DES_ecb3_encrypt(data, crypt,
+ 			     &deskey1, &deskey2, &deskey3,
+ 			     mode == ECBEncrypt ? DES_ENCRYPT : DES_DECRYPT);