From 24c7aba2bff9b5503530009136fef31ae5250f0636e637078883c4f74e6c0a19 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 22 Oct 2008 16:31:03 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=20

---
 func-parm-err.patch | 13 +++++++++++++
 openssl.changes     |  5 +++++
 openssl.spec        | 17 ++++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 func-parm-err.patch

diff --git a/func-parm-err.patch b/func-parm-err.patch
new file mode 100644
index 0000000..ad7bbfb
--- /dev/null
+++ b/func-parm-err.patch
@@ -0,0 +1,13 @@
+Index: openssl-0.9.8h/crypto/x509/x509_att.c
+===================================================================
+--- openssl-0.9.8h.orig/crypto/x509/x509_att.c
++++ openssl-0.9.8h/crypto/x509/x509_att.c
+@@ -305,7 +305,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB
+ 	if(!(ttmp = ASN1_TYPE_new())) goto err;
+ 	if (len == -1)
+ 		{
+-		if (!ASN1_TYPE_set1(ttmp, attrtype, data))
++		if (!ASN1_TYPE_set1(ttmp, attrtype, stmp))
+ 			goto err;
+ 		}
+ 	else
diff --git a/openssl.changes b/openssl.changes
index 1c89893..d835e82 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 14 09:08:47 CEST 2008 - xwhu@suse.de
+
+- Passing string as struct cause openssl segment-fault [bnc#430141] 
+
 -------------------------------------------------------------------
 Wed Jul 16 12:02:37 CEST 2008 - mkoenig@suse.de
 
diff --git a/openssl.spec b/openssl.spec
index 24adf7c..388e68a 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -2,9 +2,16 @@
 # spec file for package openssl (Version 0.9.8h)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -20,7 +27,7 @@ Group:          Productivity/Networking/Security
 Provides:       ssl
 AutoReqProv:    on
 Version:        0.9.8h
-Release:        5
+Release:        27
 Summary:        Secure Sockets and Transport Layer Security
 Url:            http://www.openssl.org/
 Source:         http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
@@ -35,6 +42,7 @@ Patch5:         openssl-0.9.6g-alpha.diff
 #Patch10:      openssl-0.9.7d-ICA_engine-jun142004.patch.bz2
 Patch6:         openssl-0.9.8a.ca-app-segfault.bug128655.dif
 Patch7:         bswap.diff
+Patch8:         func-parm-err.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -160,6 +168,7 @@ Authors:
 #%patch10 -p1
 %patch6 -p1
 %patch7
+%patch8 -p1
 cp -p %{S:10} .
 # lib64 installation fixes
 for i in Makefile.org engines/Makefile; do
@@ -371,6 +380,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %{_bindir}/%{name}
 
 %changelog
+* Tue Oct 14 2008 xwhu@suse.de
+- Passing string as struct cause openssl segment-fault [bnc#430141]
 * Wed Jul 16 2008 mkoenig@suse.de
 - do not require openssl-certs, but rather recommend it
   to avoid dependency cycle [bnc#408865]