[gentoo-commits] gentoo-x86 commit in app-crypt/xca/files: xca-0.9.3-openssl.patch

[Alon Bar-Lev (alonbl)]

alonbl      14/08/29 21:01:37

  Added:                xca-0.9.3-openssl.patch
  Log:
  Fix openssl issue, bug#520948, thanks to wmatusiak@×××××.com
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

Revision  Changes    Path
1.1                  app-crypt/xca/files/xca-0.9.3-openssl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/xca/files/xca-0.9.3-openssl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/xca/files/xca-0.9.3-openssl.patch?rev=1.1&content-type=text/plain

Index: xca-0.9.3-openssl.patch
===================================================================
From: Oliver Winker <oliver@×××××××.net>
Date: Tue, 12 Aug 2014 17:08:05 +0000 (+0200)
Subject: Fix for openssl 1.0.1i
X-Git-Url: http://gitweb.hohnstaedt.de/?p=projects%2Fxca.git;a=commitdiff_plain;h=4f7cd417320215c8ed3567536cbf2ca008946c38

Fix for openssl 1.0.1i

Fixes following application error

Errors
error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding
error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error

Due to openssl 1.0.1i change:

   commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
   Author: Emilia Kasper <emilia@×××××××.org>
   Date:   Wed Jul 2 19:02:33 2014 +0200

Commit messgae amended and
Signed-off-by: Christian Hohnstaedt <chohnstaedt@××××××××××.com>
---

diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
index cf74c32..d94cbda 100644
--- a/lib/x509v3ext.cpp
+++ b/lib/x509v3ext.cpp
@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
 x509v3ext::x509v3ext(const x509v3ext &n)
 {
 	ext = NULL;
+	if (!n.isValid())
+		return;
 	set(n.ext);
 }
 
@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
 
 bool x509v3ext::isValid() const
 {
-	return ext->value->length > 0 &&
+	return ext && ext->value && ext->value->length > 0 &&
 		OBJ_obj2nid(ext->object) != NID_undef;
 }