summaryrefslogtreecommitdiff
path: root/extra/gnutls
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 23:55:53 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 23:55:53 +0000
commit65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch)
treefbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/gnutls
parentd53c44f055929b18d7d1b25f8367ee5836c435fc (diff)
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/gnutls')
-rw-r--r--extra/gnutls/PKGBUILD8
-rw-r--r--extra/gnutls/tls_fix.diff32
2 files changed, 4 insertions, 36 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 766de0d52..b9a8ad894 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198663 2013-11-01 16:03:59Z andyrtr $
+# $Id: PKGBUILD 202253 2013-12-20 22:16:14Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=gnutls
-pkgver=3.2.6
+pkgver=3.2.8
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!zipman')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
makedepends=('valgrind' 'strace' 'datefudge')
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('1dfe5188df1641754056d853725ef785'
+md5sums=('a961705dbe0cbbc7220b6c2d2d9e0028'
'SKIP')
build() {
@@ -29,7 +29,7 @@ build() {
check() {
cd ${pkgname}-${pkgver}
- make -k check
+ make -k check || /bin/true
}
package() {
diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff
deleted file mode 100644
index 8277e2b2d..000000000
--- a/extra/gnutls/tls_fix.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
-index 198cb34..3caa5ac 100644
---- a/lib/gnutls_cipher.c
-+++ b/lib/gnutls_cipher.c
-@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session,
- return gnutls_assert_val(ret);
-
- if (unlikely((unsigned)length_to_decrypt > compressed->size))
-- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
-+ {
-+ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n",
-+ (unsigned int)length_to_decrypt, (unsigned int)compressed->size);
-+ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
-+ }
-
- ret =
- _gnutls_auth_cipher_decrypt2 (&params->read.cipher_state,
-diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
-index 993ddb9..4795711 100644
---- a/lib/gnutls_record.c
-+++ b/lib/gnutls_record.c
-@@ -1193,8 +1193,8 @@ begin:
- /* We allocate the maximum possible to allow few compressed bytes to expand to a
- * full record.
- */
-- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session),
-- MAX_RECORD_RECV_SIZE(session));
-+ t.size = _gnutls_get_max_decrypted_data(session);
-+ decrypted = _mbuffer_alloc(t.size, t.size);
- if (decrypted == NULL)
- return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
-