From owner-svn-ports-head@freebsd.org Fri Aug 17 02:12:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41FC7107E3FD; Fri, 17 Aug 2018 02:12:16 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B3E185135; Fri, 17 Aug 2018 02:12:15 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C31532209B; Fri, 17 Aug 2018 02:12:14 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7H2CE76083782; Fri, 17 Aug 2018 02:12:14 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7H2CE6d083778; Fri, 17 Aug 2018 02:12:14 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201808170212.w7H2CE6d083778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 17 Aug 2018 02:12:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477403 - head/net/hostapd X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/net/hostapd X-SVN-Commit-Revision: 477403 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 02:12:16 -0000 Author: cy Date: Fri Aug 17 02:12:14 2018 New Revision: 477403 URL: https://svnweb.freebsd.org/changeset/ports/477403 Log: Chase net/wpa_supplicant r477202 and base contrib/wpa r337819. WPA: Ignore unauthenticated encrypted EAPOL-Key data Though hostapd is technically not vulnerable, the mitigation for CVE-2018-14526 does apply cleanly, therefore it is applied to maintain consistency with net/wpa_supplicant and wpa in base. Approved by: leres@ MFH: 2018Q3 Differential Revision: https://reviews.freebsd.org/D16718 Modified: head/net/hostapd/Makefile (contents, props changed) head/net/hostapd/distinfo (contents, props changed) Modified: head/net/hostapd/Makefile ============================================================================== --- head/net/hostapd/Makefile Fri Aug 17 02:12:06 2018 (r477402) +++ head/net/hostapd/Makefile Fri Aug 17 02:12:14 2018 (r477403) @@ -3,17 +3,20 @@ PORTNAME= hostapd PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ -PATCH_SITES= https://w1.fi/security/2017-1/:2017_1 +PATCH_SITES= https://w1.fi/security/2017-1/:2017_1 \ + https://w1.fi/security/2018-1/:2018_1 + PATCHFILES= rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch:2017_1 \ rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch:2017_1 \ rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch:2017_1 \ rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch:2017_1 \ rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch:2017_1 \ rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch:2017_1 \ - rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch:2017_1 + rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch:2017_1 \ + rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch:2018_1 PATCH_DIST_STRIP= -p1 MAINTAINER= leres@FreeBSD.org Modified: head/net/hostapd/distinfo ============================================================================== --- head/net/hostapd/distinfo Fri Aug 17 02:12:06 2018 (r477402) +++ head/net/hostapd/distinfo Fri Aug 17 02:12:14 2018 (r477403) @@ -1,4 +1,4 @@ -TIMESTAMP = 1508200169 +TIMESTAMP = 1534471067 SHA256 (hostapd-2.6.tar.gz) = 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d SIZE (hostapd-2.6.tar.gz) = 1822341 SHA256 (rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch) = 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b @@ -15,3 +15,5 @@ SHA256 (rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfigu SIZE (rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch) = 4309 SHA256 (rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch) = c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 SIZE (rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch) = 2750 +SHA256 (rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch) = 960c3cf2a514479b0b4cf09665186a1a9f5d28e8b05dec23db75c6cc13eb1f7c +SIZE (rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch) = 1999