Accepting request 88220 from Base:System

Fix bnc#724421. (forwarded request 88217 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/88220
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=38
This commit is contained in:
Sascha Peilicke 2011-10-18 12:08:55 +00:00 committed by Git OBS Bridge
parent 63568d7d7c
commit b82f3b94cd
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From 7043a8e9e314b0c2eb7ac5c2278a0b103f6a758a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Mon, 17 Oct 2011 15:15:46 +0200
Subject: [PATCH] Correctly terminate a string with \0 before concatenating to
it
Fix a potential crash:
https://bugzilla.novell.com/show_bug.cgi?id=724421
---
lib/x509/common.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 6bb4746..0651d2e 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -390,6 +390,7 @@ _gnutls_x509_data2hex (const opaque * data, size_t data_size,
if (out)
{
out[0] = '#';
+ out[1] = '\0';
_gnutls_str_cat (out, *sizeof_out, res);
}
--
1.7.7

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 17 13:21:57 UTC 2011 - vuntz@opensuse.org
- Add gnutls-fix-crash-on-strcat.patch: make sure a string is
nul-terminated before using strcat on it. Fix bnc#724421.
-------------------------------------------------------------------
Fri Sep 30 15:16:51 UTC 2011 - uli@suse.com

View File

@ -32,6 +32,8 @@ Source0: %{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM gnutls-fix-compression.patch vuntz@opensuse.org -- Taken from git, fix decompression/compression
Patch0: gnutls-fix-compression.patch
# PATCH-FIX-UPSTREAM gnutls-fix-crash-on-strcat.patch bnc#724421 vuntz@opensuse.org -- Fix a crash because of badly used strcat, sent upstream by mail on 2011-10-17
Patch1: gnutls-fix-crash-on-strcat.patch
BuildRequires: gcc-c++
BuildRequires: libnettle-devel >= 2.2
BuildRequires: p11-kit-devel
@ -156,6 +158,7 @@ implements the proposed standards of the IETF's TLS working group.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure \