forked from pool/openssl
Accepting request 19418 from Base:System
Copy from Base:System/openssl based on submit request 19418 from user coolo OBS-URL: https://build.opensuse.org/request/show/19418 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=26
This commit is contained in:
parent
412a5012b8
commit
61dcd4d00d
27
bug-526319_openssl-0.9.8k-no-extssl.patch
Normal file
27
bug-526319_openssl-0.9.8k-no-extssl.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff -up openssl-0.9.8g/ssl/t1_lib.c.no-extssl openssl-0.9.8g/ssl/t1_lib.c
|
||||
--- openssl-0.9.8g/ssl/t1_lib.c.no-extssl 2007-10-19 09:44:10.000000000 +0200
|
||||
+++ openssl-0.9.8g/ssl/t1_lib.c 2008-08-10 21:42:11.000000000 +0200
|
||||
@@ -132,6 +132,11 @@ unsigned char *ssl_add_clienthello_tlsex
|
||||
int extdatalen=0;
|
||||
unsigned char *ret = p;
|
||||
|
||||
+ if (s->client_version != TLS1_VERSION && s->client_version != DTLS1_VERSION)
|
||||
+ {
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
ret+=2;
|
||||
|
||||
if (ret>=limit) return NULL; /* this really never occurs, but ... */
|
||||
@@ -202,6 +207,11 @@ unsigned char *ssl_add_serverhello_tlsex
|
||||
int extdatalen=0;
|
||||
unsigned char *ret = p;
|
||||
|
||||
+ if (s->version != TLS1_VERSION && s->version != DTLS1_VERSION)
|
||||
+ {
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
ret+=2;
|
||||
if (ret>=limit) return NULL; /* this really never occurs, but ... */
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 1 10:21:16 CEST 2009 - gjhe@novell.com
|
||||
|
||||
- fix Bug [bnc#526319]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 26 11:24:16 CEST 2009 - coolo@novell.com
|
||||
|
||||
- use %patch0 for Patch0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 3 11:53:48 CEST 2009 - gjhe@novell.com
|
||||
|
||||
|
@ -32,7 +32,7 @@ Obsoletes: openssl-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 0.9.8k
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Secure Sockets and Transport Layer Security
|
||||
Url: http://www.openssl.org/
|
||||
Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
|
||||
@ -51,6 +51,7 @@ Patch8: func-parm-err.patch
|
||||
%ifarch s390x
|
||||
Patch9: disable-optimization-for-s390x.diff
|
||||
%endif
|
||||
Patch10: bug-526319_openssl-0.9.8k-no-extssl.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -177,7 +178,7 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
@ -190,6 +191,7 @@ Authors:
|
||||
%ifarch s390x
|
||||
%patch9
|
||||
%endif
|
||||
%patch10 -p1
|
||||
cp -p %{S:10} .
|
||||
# lib64 installation fixes
|
||||
for i in Makefile.org engines/Makefile; do
|
||||
|
Loading…
x
Reference in New Issue
Block a user