From e935f97f22f6391e601b9378a62b4c5f944cb665 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 13 2019 04:48:54 +0000
Subject: import freeradius-3.0.17-4.module+el8.0.0+3108+851cb559


---

diff --git a/SOURCES/freeradius-EAP-PWD-curve-handling.patch b/SOURCES/freeradius-EAP-PWD-curve-handling.patch
new file mode 100644
index 0000000..3b24a48
--- /dev/null
+++ b/SOURCES/freeradius-EAP-PWD-curve-handling.patch
@@ -0,0 +1,45 @@
+diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+index 7f91e4b230..848ca2055e 100644
+--- a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
++++ b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+@@ -373,11 +373,26 @@ int process_peer_commit (pwd_session_t *session, uint8_t *in, size_t in_len, BN_
+ 	data_len = BN_num_bytes(session->order);
+ 	BN_bin2bn(ptr, data_len, session->peer_scalar);
+
++	/* validate received scalar */
++	if (BN_is_zero(session->peer_scalar) ||
++	    BN_is_one(session->peer_scalar) ||
++	    BN_cmp(session->peer_scalar, session->order) >= 0) {
++		ERROR("Peer's scalar is not within the allowed range");
++		goto finish;
++	}
++
+ 	if (!EC_POINT_set_affine_coordinates_GFp(session->group, session->peer_element, x, y, bnctx)) {
+ 		DEBUG2("pwd: unable to get coordinates of peer's element");
+ 		goto finish;
+ 	}
+
++	/* validate received element */
++	if (!EC_POINT_is_on_curve(session->group, session->peer_element, bnctx) ||
++	    EC_POINT_is_at_infinity(session->group, session->peer_element)) {
++		ERROR("Peer's element is not a point on the elliptic curve");
++		goto finish;
++	}
++
+ 	/* check to ensure peer's element is not in a small sub-group */
+ 	if (BN_cmp(cofactor, BN_value_one())) {
+ 		if (!EC_POINT_mul(session->group, point, NULL, session->peer_element, cofactor, NULL)) {
+@@ -391,6 +406,13 @@ int process_peer_commit (pwd_session_t *session, uint8_t *in, size_t in_len, BN_
+ 		}
+ 	}
+
++	/* detect reflection attacks */
++	if (BN_cmp(session->peer_scalar, session->my_scalar) == 0 ||
++	    EC_POINT_cmp(session->group, session->peer_element, session->my_element, bnctx) == 0) {
++		ERROR("Reflection attack detected");
++		goto finish;
++	}
++
+ 	/* compute the shared key, k */
+ 	if ((!EC_POINT_mul(session->group, K, NULL, session->pwe, session->peer_scalar, bnctx)) ||
+ 	    (!EC_POINT_add(session->group, K, K, session->peer_element, bnctx)) ||
diff --git a/SPECS/freeradius.spec b/SPECS/freeradius.spec
index a0f00bd..d30dd55 100644
--- a/SPECS/freeradius.spec
+++ b/SPECS/freeradius.spec
@@ -9,7 +9,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 3.0.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -36,6 +36,7 @@ Patch4: freeradius-Add-missing-option-descriptions.patch
 Patch5: freeradius-OpenSSL-HMAC-MD5.patch
 Patch6: freeradius-OpenSSL-HMAC-SHA1.patch
 Patch7: freeradius-python2-shebangs.patch
+Patch8: freeradius-EAP-PWD-curve-handling.patch
 
 %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
@@ -221,6 +222,7 @@ This plugin provides the REST support for the FreeRADIUS server project.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 # Force compile/link options, extra security for network facing daemon
@@ -848,6 +850,10 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest
 
 %changelog
+* Fri Dec 14 2018 Alexander Scheel <ascheel@redhat.com> - 3.0.17-4
+- Fixes two EAP-PWD security issues
+  Resolves: bz#1699416 authentication bypass with an invalid curve attack
+
 * Fri Dec 14 2018 Alexander Scheel <ascheel@redhat.com> - 3.0.17-2
 - Updates radiusd.service to start after network-online.target
   Resolves: bz#1637275