Commit 56b56805 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/gnutls: fix CVE-2013-2116

fixes #2030
parent 18be40b9
......@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnutls
pkgver=2.12.7
pkgrel=2
pkgrel=3
pkgdesc="A TLS protocol implementation"
url="http://www.gnu.org/software/gnutls/"
arch="all"
......@@ -15,6 +15,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-utils"
source="http://ftp.gnu.org/pub/gnu/gnutls/$pkgname-$pkgver.tar.bz2
cve-2012-1573.patch
CVE-2013-1619.patch
CVE-2013-2116.patch
"
prepare() {
......@@ -54,4 +55,5 @@ utils() {
}
md5sums="4b48aa3119f549d30d550bf4162c721b gnutls-2.12.7.tar.bz2
d0e686da958069dec743c8daca7dc17a cve-2012-1573.patch
0e404c8e8117f4384ec04ed139decd8b CVE-2013-1619.patch"
0e404c8e8117f4384ec04ed139decd8b CVE-2013-1619.patch
a0546d6e32372492a982b4365ccffa21 CVE-2013-2116.patch"
From 5164d5a1d57cd0372a5dd074382ca960ca18b27d Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 23 May 2013 09:54:37 +0200
Subject: [PATCH] re-applied sanity check patch
---
lib/gnutls_cipher.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 2835121..71f5a98 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -561,6 +561,8 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
return GNUTLS_E_DECRYPTION_FAILED;
}
pad = ciphertext.data[ciphertext.size - 1]; /* pad */
+ if (pad+1 > ciphertext.size-hash_size)
+ pad_failed = GNUTLS_E_DECRYPTION_FAILED;
/* Check the pading bytes (TLS 1.x).
* Note that we access all 256 bytes of ciphertext for padding check
--
1.7.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment