From: Jouni Malinen <jouni@codeaurora.org>
Date: Wed, 24 Jun 2020 22:18:30 +0000 (+0300)
Subject: SAE-PK: Fix password validation check for Sec
X-Git-Tag: hostap_2_10~1094
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d8c5f344e1c3be8a49d782b6d59e0b3a6742d97;p=thirdparty%2Fhostap.git

SAE-PK: Fix password validation check for Sec

The 0..3 value decoded from the password was not incremented to the
actual 2..5 range for Sec. This resulted in not properly detecting the
minimum password length.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---

diff --git a/src/common/sae_pk.c b/src/common/sae_pk.c
index b294312ef..b1c35d100 100644
--- a/src/common/sae_pk.c
+++ b/src/common/sae_pk.c
@@ -38,7 +38,7 @@ bool sae_pk_valid_password(const char *pw)
 	idx = os_strchr(sae_pk_base32_table, pw[0]);
 	if (!idx)
 		return false;
-	sec = ((u8) ((idx - sae_pk_base32_table) & 0x1f)) >> 3;
+	sec = (((u8) ((idx - sae_pk_base32_table) & 0x1f)) >> 3) + 2;
 	if ((sec == 2 && pw_len < 14) ||
 	    (sec == 3 && pw_len < 13) ||
 	    (sec == 4 && pw_len < 11) ||