[PATCH 09/16] eap-wsc: Validate enrollee_nonce (N1) in M{2,4,6,8}

[PATCH 09/16] eap-wsc: Validate enrollee_nonce (N1) in M{2,4,6,8}

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]

---
 src/eap-wsc.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/eap-wsc.c b/src/eap-wsc.c
index 0fec29c6..ccb52979 100644
--- a/src/eap-wsc.c
+++ b/src/eap-wsc.c
@@ -479,6 +479,10 @@ static void eap_wsc_handle_m8(struct eap_state *eap,
 		return;
 	}
 
+	if (memcmp(m8.enrollee_nonce, wsc->m1->enrollee_nonce,
+						sizeof(m8.enrollee_nonce)))
+		return;
+
 	if (!authenticator_check(wsc, pdu, len))
 		return;
 
@@ -580,6 +584,10 @@ static void eap_wsc_handle_m6(struct eap_state *eap,
 	if (wsc_parse_m6(pdu, len, &m6, &encrypted) != 0)
 		goto send_nack;
 
+	if (memcmp(m6.enrollee_nonce, wsc->m1->enrollee_nonce,
+						sizeof(m6.enrollee_nonce)))
+		return;
+
 	if (!authenticator_check(wsc, pdu, len))
 		return;
 
@@ -677,6 +685,10 @@ static void eap_wsc_handle_m4(struct eap_state *eap,
 	if (wsc_parse_m4(pdu, len, &m4, &encrypted) != 0)
 		goto send_nack;
 
+	if (memcmp(m4.enrollee_nonce, wsc->m1->enrollee_nonce,
+						sizeof(m4.enrollee_nonce)))
+		return;
+
 	if (!authenticator_check(wsc, pdu, len))
 		return;
 
@@ -815,6 +827,10 @@ static void eap_wsc_handle_m2(struct eap_state *eap,
 		return;
 	}
 
+	if (memcmp(wsc->m2->enrollee_nonce, wsc->m1->enrollee_nonce,
+					sizeof(wsc->m2->enrollee_nonce)))
+		return;
+
 	if (!l_key_validate_dh_payload(wsc->m2->public_key,
 					sizeof(wsc->m2->public_key),
 					crypto_dh5_prime,
-- 
2.25.1

Re: [PATCH 09/16] eap-wsc: Validate enrollee_nonce (N1) in M{2, 4, 6, 8}

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

Hi Andrew,

On 8/12/20 7:53 PM, Andrew Zaborowski wrote:
> ---
>   src/eap-wsc.c | 16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
> 

Patch 9 and 10 applied, thanks.

By the way, somehow patch 8 did not make it to the list?

Regards,
-Denis