[Pkg-openssl-changes] r759 - openssl/branches/squeeze/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2015-12-03 17:47:55 +0000 (Thu, 03 Dec 2015)
New Revision: 759

Modified:
   openssl/branches/squeeze/debian/patches/CVE-2015-3195.patch
Log:
Make patch apply


Modified: openssl/branches/squeeze/debian/patches/CVE-2015-3195.patch
===================================================================
--- openssl/branches/squeeze/debian/patches/CVE-2015-3195.patch	2015-12-03 17:44:02 UTC (rev 758)
+++ openssl/branches/squeeze/debian/patches/CVE-2015-3195.patch	2015-12-03 17:47:55 UTC (rev 759)
@@ -21,20 +21,20 @@
  crypto/asn1/tasn_dec.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-Index: openssl-1.0.1k/crypto/asn1/tasn_dec.c
+Index: openssl-0.9.8o/crypto/asn1/tasn_dec.c
 ===================================================================
---- openssl-1.0.1k.orig/crypto/asn1/tasn_dec.c
-+++ openssl-1.0.1k/crypto/asn1/tasn_dec.c
-@@ -169,6 +169,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
+--- openssl-0.9.8o.orig/crypto/asn1/tasn_dec.c
++++ openssl-0.9.8o/crypto/asn1/tasn_dec.c
+@@ -167,6 +167,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
  	int otag;
  	int ret = 0;
- 	ASN1_VALUE **pchptr, *ptmpval;
+ 	ASN1_VALUE *pchval, **pchptr, *ptmpval;
 +        int combine = aclass & ASN1_TFLG_COMBINE;
 +        aclass &= ~ASN1_TFLG_COMBINE;
  	if (!pval)
  		return 0;
  	if (aux && aux->asn1_cb)
-@@ -534,7 +536,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
+@@ -533,7 +535,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval,
  	auxerr:
  	ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_AUX_ERROR);
  	err:
@@ -44,7 +44,7 @@
  	if (errtt)
  		ERR_add_error_data(4, "Field=", errtt->field_name,
  					", Type=", it->sname);
-@@ -762,7 +765,7 @@ static int asn1_template_noexp_d2i(ASN1_
+@@ -759,7 +762,7 @@ static int asn1_template_noexp_d2i(ASN1_
  		{
  		/* Nothing special */
  		ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),