From owner-svn-ports-all@FreeBSD.ORG Wed Dec 18 23:04:25 2013 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 71283DFD; Wed, 18 Dec 2013 23:04:25 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5CA031FEE; Wed, 18 Dec 2013 23:04:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIN4P1k015632; Wed, 18 Dec 2013 23:04:25 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIN4ObQ015628; Wed, 18 Dec 2013 23:04:24 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312182304.rBIN4ObQ015628@svn.freebsd.org> From: Xin LI Date: Wed, 18 Dec 2013 23:04:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336860 - in head: ftp/curl ftp/curl/files security/vuxml X-SVN-Group: ports-head 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.17 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: Wed, 18 Dec 2013 23:04:25 -0000 Author: delphij Date: Wed Dec 18 23:04:24 2013 New Revision: 336860 URL: http://svnweb.freebsd.org/changeset/ports/336860 Log: Apply vendor fix for CVE-2013-6422, cURL libcurl cert name check ignore with GnuTLS. Document the vulnerability fix in vuxml while I'm here. Added: head/ftp/curl/files/patch-CVE-2013-6422 (contents, props changed) Modified: head/ftp/curl/Makefile head/security/vuxml/vuln.xml Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Wed Dec 18 20:20:49 2013 (r336859) +++ head/ftp/curl/Makefile Wed Dec 18 23:04:24 2013 (r336860) @@ -3,7 +3,7 @@ PORTNAME= curl PORTVERSION= 7.33.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet Added: head/ftp/curl/files/patch-CVE-2013-6422 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/curl/files/patch-CVE-2013-6422 Wed Dec 18 23:04:24 2013 (r336860) @@ -0,0 +1,32 @@ +--- ./lib/gtls.c.orig 2013-10-12 15:05:06.000000000 -0700 ++++ ./lib/gtls.c 2013-12-18 15:00:22.000000000 -0800 +@@ -5,7 +5,7 @@ + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * +- * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. ++ * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms +@@ -633,10 +633,8 @@ + else + infof(data, "\t server certificate verification OK\n"); + } +- else { ++ else + infof(data, "\t server certificate verification SKIPPED\n"); +- goto after_server_cert_verification; +- } + + /* initialize an X.509 certificate structure. */ + gnutls_x509_crt_init(&x509_cert); +@@ -766,8 +764,6 @@ + + gnutls_x509_crt_deinit(x509_cert); + +-after_server_cert_verification: +- + /* compression algorithm (if any) */ + ptr = gnutls_compression_get_name(gnutls_compression_get(session)); + /* the *_get_name() says "NULL" if GNUTLS_COMP_NULL is returned */ Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Wed Dec 18 20:20:49 2013 (r336859) +++ head/security/vuxml/vuln.xml Wed Dec 18 23:04:24 2013 (r336860) @@ -51,6 +51,49 @@ Note: Please add new entries to the beg --> + + cURL library -- cert name check ignore with GnuTLS + + + curl + 7.21.47.33.0_2 + + + + +

cURL project reports:

+
+

libcurl is vulnerable to a case of missing out the checking + of the certificate CN or SAN name field when the digital + signature verification is turned off.

+

libcurl offers two separate and independent options for + verifying a server's TLS certificate. CURLOPT_SSL_VERIFYPEER + and CURLOPT_SSL_VERIFYHOST. The first one tells libcurl to + verify the trust chain using a CA cert bundle, while the + second tells libcurl to make sure that the name fields in + the server certificate meets the criteria. Both options are + enabled by default.

+

This flaw had the effect that when an application disabled + CURLOPT_SSL_VERIFYPEER, libcurl mistakenly also skipped the + CURLOPT_SSL_VERIFYHOST check. Applications can disable + CURLOPT_SSL_VERIFYPEER and still achieve security by doing + the check on its own using other means.

+

The curl command line tool is not affected by this problem + as it either enables both options or disables both at the + same time.

+
+ + + + http://curl.haxx.se/docs/adv_20131217.html + CVE-2013-6422 + + + 2013-12-17 + 2013-12-18 + + + gnupg -- RSA Key Extraction via Low-Bandwidth Acoustic Cryptanalysis attack