SOURCES: wvstreams-gcc4.patch - crypto/wvx509.cc hack readded, now...

[sparky]

Author: sparky                       Date: Fri Jul 28 12:59:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- crypto/wvx509.cc hack readded, now with:
  #if OPENSSL_VERSION_NUMBER >= 0x0090708FL
  (now builds)

---- Files affected:
SOURCES:
   wvstreams-gcc4.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/wvstreams-gcc4.patch
diff -u SOURCES/wvstreams-gcc4.patch:1.3 SOURCES/wvstreams-gcc4.patch:1.4
--- SOURCES/wvstreams-gcc4.patch:1.3	Thu Jul 27 22:08:14 2006
+++ SOURCES/wvstreams-gcc4.patch	Fri Jul 28 14:59:18 2006
@@ -42,3 +42,31 @@
  	    DES_ecb3_encrypt(data, crypt,
  			     &deskey1, &deskey2, &deskey3,
  			     mode == ECBEncrypt ? DES_ENCRYPT : DES_DECRYPT);
+--- wvstreams-4.0.2/crypto/wvx509.cc	2006-07-28 12:50:53.000000000 +0000
++++ wvstreams-4.0.2.gcc4/crypto/wvx509.cc	2006-07-28 12:50:14.000000000 +0000
+@@ -1162,6 +1162,17 @@
+ 		else
+ 		{
+ 		    void *ext_data = NULL;
++#if OPENSSL_VERSION_NUMBER >= 0x0090708FL
++		    if (method->it) 
++			ext_data = ASN1_item_d2i(NULL, 
++				(const unsigned char**) &ext->value->data, 
++						ext->value->length, 
++						ASN1_ITEM_ptr(method->it));
++		    else
++			ext_data = method->d2i(NULL,
++				(const unsigned char**) &ext->value->data, 
++					      ext->value->length);
++#else
+ 		    if (method->it) 
+ 			ext_data = ASN1_item_d2i(NULL, &ext->value->data, 
+ 						ext->value->length, 
+@@ -1169,6 +1180,7 @@
+ 		    else
+ 			ext_data = method->d2i(NULL, &ext->value->data, 
+ 					      ext->value->length);
++#endif
+ 		    
+ 		    if (method->i2s)
+ 		    {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/wvstreams-gcc4.patch?r1=1.3&r2=1.4&f=u