[Pkg-swan-devel] [strongswan] 01/02: Fix CVE-2015-8023

[Yves-Alexis Perez]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch wheezy-security
in repository strongswan.

commit 8c679972be20c6db7603361c231bcc1bb99a4f71
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Nov 10 11:16:22 2015 +0100

    Fix CVE-2015-8023
    
    * debian/patches:
      - CVE-2015-8023_eap_mschapv2_state added, fix authentication bypass when
      using EAP MSCHAPv2.
---
 debian/changelog                                   |  8 +++++
 .../patches/CVE-2015-8023_eap_mschapv2_state.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e7b97dc..9a86bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+strongswan (4.5.2-1.5+deb7u8) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - CVE-2015-8023_eap_mschapv2_state added, fix authentication bypass when
+    using EAP MSCHAPv2.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 10 Nov 2015 11:15:19 +0100
+
 strongswan (4.5.2-1.5+deb7u7) wheezy-security; urgency=high
 
   * debian/patches:
diff --git a/debian/patches/CVE-2015-8023_eap_mschapv2_state.patch b/debian/patches/CVE-2015-8023_eap_mschapv2_state.patch
new file mode 100644
index 0000000..e519a1f
--- /dev/null
+++ b/debian/patches/CVE-2015-8023_eap_mschapv2_state.patch
@@ -0,0 +1,34 @@
+From 91762f11e223e33b82182150d7c4cf7c2ec3cefa Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias at strongswan.org>
+Date: Thu, 29 Oct 2015 11:18:27 +0100
+Subject: [PATCH] eap-mschapv2: Only succeed authentication if MSK was
+ established
+
+An MSK is only established if the client successfully authenticated
+itself and only then must we accept an MSCHAPV2_SUCCESS message.
+
+Fixes CVE-2015-8023
+---
+ src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
+index f7f39f9841d2..931e3c41dde4 100644
+--- a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
++++ b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
+@@ -1145,7 +1145,11 @@ METHOD(eap_method_t, process_server, status_t,
+ 		}
+ 		case MSCHAPV2_SUCCESS:
+ 		{
+-			return SUCCESS;
++			if (this->msk.ptr)
++			{
++				return SUCCESS;
++			}
++			break;
+ 		}
+ 		case MSCHAPV2_FAILURE:
+ 		{
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 21aa3e1..84693dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ CVE-2014-2891.patch
 CVE-2014-9221_modp_custom.patch
 CVE-2014-9221_dh_group.patch
 CVE-2015-4171_enforce_remote_auth.patch
+CVE-2015-8023_eap_mschapv2_state.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git