From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A080138334 for ; Wed, 5 Dec 2018 20:41:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C6C5E0986; Wed, 5 Dec 2018 20:41:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F520E0986 for ; Wed, 5 Dec 2018 20:41:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E4D3335C7D for ; Wed, 5 Dec 2018 20:41:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C50964EF for ; Wed, 5 Dec 2018 20:41:12 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1544042382.102ca740a0e42464d91b474119a03c8b26cdefaa.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/, net-wireless/wpa_supplicant/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild X-VCS-Directories: net-wireless/wpa_supplicant/files/ net-wireless/wpa_supplicant/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 102ca740a0e42464d91b474119a03c8b26cdefaa X-VCS-Branch: master Date: Wed, 5 Dec 2018 20:41:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 949416f7-e05e-49e6-b3df-ec36278b551a X-Archives-Hash: fdbe8b292cdf4c9dfa40a278dcacc955 commit: 102ca740a0e42464d91b474119a03c8b26cdefaa Author: Rick Farina gentoo org> AuthorDate: Wed Dec 5 20:39:42 2018 +0000 Commit: Rick Farina gentoo org> CommitDate: Wed Dec 5 20:39:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102ca740 net-wireless/wpa_supplicant: fix bug #663172 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina gentoo.org> ...-unauthenticated-encrypted-EAPOL-Key-data.patch | 44 ++++++++++++++++++++++ ...2.6-r9.ebuild => wpa_supplicant-2.6-r10.ebuild} | 3 ++ 2 files changed, 47 insertions(+) diff --git a/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch b/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch new file mode 100644 index 00000000000..a62b52c6b9a --- /dev/null +++ b/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch @@ -0,0 +1,44 @@ +From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef +Date: Sun, 15 Jul 2018 01:25:53 +0200 +Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data + +Ignore unauthenticated encrypted EAPOL-Key data in supplicant +processing. When using WPA2, these are frames that have the Encrypted +flag set, but not the MIC flag. + +When using WPA2, EAPOL-Key frames that had the Encrypted flag set but +not the MIC flag, had their data field decrypted without first verifying +the MIC. In case the data field was encrypted using RC4 (i.e., when +negotiating TKIP as the pairwise cipher), this meant that +unauthenticated but decrypted data would then be processed. An adversary +could abuse this as a decryption oracle to recover sensitive information +in the data field of EAPOL-Key messages (e.g., the group key). +(CVE-2018-14526) + +Signed-off-by: Mathy Vanhoef +--- + src/rsn_supp/wpa.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c +--- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.000000000 +0300 ++++ wpa_supplicant-2.6/src/rsn_supp/wpa.c 2018-08-08 16:55:11.506831029 +0300 +@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c + + if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) && + (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) { ++ /* ++ * Only decrypt the Key Data field if the frame's authenticity ++ * was verified. When using AES-SIV (FILS), the MIC flag is not ++ * set, so this check should only be performed if mic_len != 0 ++ * which is the case in this code branch. ++ */ ++ if (!(key_info & WPA_KEY_INFO_MIC)) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data"); ++ goto out; ++ } + if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data, + &key_data_len)) + goto out; diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild similarity index 98% rename from net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild rename to net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild index 19e3fbfe5a0..36a7ffe69b6 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild @@ -146,6 +146,9 @@ src_prepare() { eapply "${FILESDIR}/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch" eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch" + # https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt + eapply "${FILESDIR}/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch" + # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die }