commit 409fc122fd333784accfd3007db838d1ffb8fa9f
author Jouni Malinen <quic_jouni@quicinc.com> Thu Sep 29 18:54:09 2022 +0300
committer Jouni Malinen <quic_jouni@quicinc.com> Thu Sep 29 20:22:17 2022 +0300
tree 664bf4c8bdae3245f9184a022885f480c3872d3d
parent 50be56039f7462a0014cb023b55de42b42a0ca76

Use helper functions for checking Passpoint release

Avoid copying checks against PROGRAM_HS2* values by using helper
functions for this.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

server.c

diff --git a/server.c b/server.c
index be8d4e1..0d2da05 100644
--- a/server.c
+++ b/server.c
@@ -325,8 +325,7 @@
 	}
 
 	prog = sigma_program_to_enum(var);
-	if (prog != PROGRAM_HS2_R2 && prog != PROGRAM_HS2_R3 &&
-	    prog != PROGRAM_HS2_R4) {
+	if (!is_passpoint_r2_or_newer(prog)) {
 		send_resp(dut, conn, SIGMA_ERROR,
 			  "errorCode,Unsupported program");
 		return STATUS_SENT;
@@ -885,8 +884,7 @@
 	}
 
 	prog = sigma_program_to_enum(var);
-	if (prog != PROGRAM_HS2_R2 && prog != PROGRAM_HS2_R3 &&
-	    prog != PROGRAM_HS2_R4) {
+	if (!is_passpoint_r2_or_newer(prog)) {
 		send_resp(dut, conn, SIGMA_ERROR,
 			  "errorCode,Unsupported program");
 		return STATUS_SENT;
@@ -1014,8 +1012,7 @@
 	}
 
 	prog = sigma_program_to_enum(var);
-	if (prog != PROGRAM_HS2_R2 && prog != PROGRAM_HS2_R3 &&
-	    prog != PROGRAM_HS2_R4) {
+	if (!is_passpoint_r2_or_newer(prog)) {
 		send_resp(dut, conn, SIGMA_ERROR,
 			  "errorCode,Unsupported program");
 		return STATUS_SENT;