Accepting request 574115 from Base:System

OBS-URL: https://build.opensuse.org/request/show/574115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=106
This commit is contained in:
Dominique Leuenberger 2018-02-12 09:09:02 +00:00 committed by Git OBS Bridge
parent 4d1ca43878
commit 5886f877a6
3 changed files with 24 additions and 2 deletions

View File

@ -0,0 +1,14 @@
Index: gnutls-3.6.1/lib/accelerated/x86/aes-cbc-x86-ssse3.c
===================================================================
--- gnutls-3.6.1.orig/lib/accelerated/x86/aes-cbc-x86-ssse3.c 2018-02-06 14:03:54.986532959 +0100
+++ gnutls-3.6.1/lib/accelerated/x86/aes-cbc-x86-ssse3.c 2018-02-06 14:04:06.022686653 +0100
@@ -65,6 +65,9 @@ aes_ssse3_cipher_setkey(void *_ctx, cons
struct aes_ctx *ctx = _ctx;
int ret;
+ if (keysize != 16 && keysize != 24 && keysize != 32)
+ return GNUTLS_E_INVALID_REQUEST;
+
if (ctx->enc)
ret =
vpaes_set_encrypt_key(userkey, keysize * 8,

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 7 11:08:54 UTC 2018 - vcizek@suse.com
- Sanity check key size in SSSE3 AES cipher implementation (bsc#1074303)
* add gnutls-check_aes_keysize.patch
-------------------------------------------------------------------
Wed Nov 1 15:13:55 UTC 2017 - astieger@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnutls
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -35,6 +35,8 @@ Source2: %{name}.keyring
Source3: baselibs.conf
Patch1: gnutls-3.5.11-skip-trust-store-tests.patch
Patch2: gnutls-3.6.0-disable-flaky-dtls_resume-test.patch
# PATCH-FIX-UPSTREAM https://gitlab.com/gnutls/gnutls/merge_requests/592
Patch3: gnutls-check_aes_keysize.patch
BuildRequires: autogen
BuildRequires: automake
BuildRequires: datefudge
@ -158,6 +160,7 @@ GnuTLS Wrappers for GNU Guile, a dialect of Scheme.
%prep
%setup -q
%patch1 -p1
%patch3 -p1
# dtls-resume test fails on PPC
%ifarch ppc64 ppc64le ppc
%patch2 -p1
@ -229,7 +232,6 @@ make %{?_smp_mflags} check || {
%post -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig
%postun -n libgnutlsxx%{gnutlsxx_sover} -p /sbin/ldconfig
%post -n libgnutls-devel
%install_info --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz