svn commit: r356656 - in branches/2014Q2/security/gnutls: . files

[Bryan Drewery]

Author: bdrewery
Date: Thu Jun  5 17:54:33 2014
New Revision: 356656
URL: http://svnweb.freebsd.org/changeset/ports/356656
QAT: https://qat.redports.org/buildarchive/r356656/

Log:
  MFH: r356535
  
  Patch CVE-2014-3466 to prevent memory corruption due to server hello parsing.
  
  Skipped PORTREVISION 5 which made several framework updates not needed here.
  
  Obtained from:  https://gitorious.org/gnutls/gnutls/commit/688ea6428a432c39203d00acd1af0e7684e5ddfd
  Security:       CVE-2014-3466, 9733c480-ebff-11e3-970b-206a8a720317

Added:
  branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c
     - copied unchanged from r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c
Modified:
  branches/2014Q2/security/gnutls/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/security/gnutls/Makefile
==============================================================================
--- branches/2014Q2/security/gnutls/Makefile	Thu Jun  5 17:51:35 2014	(r356655)
+++ branches/2014Q2/security/gnutls/Makefile	Thu Jun  5 17:54:33 2014	(r356656)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	2.12.23
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	security net
 MASTER_SITES=	\
 	ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/ \

Copied: branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c (from r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c	Thu Jun  5 17:54:33 2014	(r356656, copy of r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c)
@@ -0,0 +1,11 @@
+--- lib/gnutls_handshake.c.orig	2012-11-03 06:03:47.000000000 -0700
++++ lib/gnutls_handshake.c	2014-06-04 07:55:49.138570114 -0700
+@@ -1797,7 +1797,7 @@
+   DECR_LEN (len, 1);
+   session_id_len = data[pos++];
+ 
+-  if (len < session_id_len)
++  if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE)
+     {
+       gnutls_assert ();
+       return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;