From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 17:54:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE5EE7FB; Thu, 5 Jun 2014 17:54:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 814EE284C; Thu, 5 Jun 2014 17:54:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55HsY9s092649; Thu, 5 Jun 2014 17:54:34 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HsYpx092647; Thu, 5 Jun 2014 17:54:34 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051754.s55HsYpx092647@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:54:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356656 - in branches/2014Q2/security/gnutls: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:54:34 -0000 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;