From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 13 Dec 2017 17:55:39 +0000 (+0000)
Subject: Minor fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0dfd6b71910a69a41e6a479c50cf18d6cd63565;p=thirdparty%2Ffreeradius-server.git

Minor fixes
---

diff --git a/src/modules/rlm_eap/lib/sim/milenage.c b/src/modules/rlm_eap/lib/sim/milenage.c
index f664595c37d..5c3118a80de 100644
--- a/src/modules/rlm_eap/lib/sim/milenage.c
+++ b/src/modules/rlm_eap/lib/sim/milenage.c
@@ -287,7 +287,7 @@ int milenage_umts_generate(uint8_t autn[MILENAGE_AUTN_SIZE],
 	    (milenage_f2345(res, ik, ck, ak_buff, NULL, opc, ki, rand) < 0)) return -1;
 
 	/*
-	 *	AUTN = (SQN ^ AK) || AMF || MAC
+	 *	AUTN = (SQN ^ AK) || AMF || MAC_A
 	 */
 	for (i = 0; i < sizeof(sqn_buff); i++) *p++ = sqn_buff[i] ^ ak_buff[i];
 	memcpy(p, amf, MILENAGE_AMF_SIZE);
diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
index a4d5b6783e6..627a57ee349 100644
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
@@ -630,7 +630,7 @@ static int process_eap_sim_challenge(eap_session_t *eap_session, VALUE_PAIR *vps
 	 *	send a success notification, otherwise send a
 	 *	normal EAP-Success.
 	 */
-	if (fr_pair_find_by_child_num(vps, dict_aka_root, FR_EAP_SIM_RESULT_IND, TAG_ANY)) {
+	if (fr_pair_find_by_child_num(vps, dict_sim_root, FR_EAP_SIM_RESULT_IND, TAG_ANY)) {
 		eap_sim_state_enter(eap_session, EAP_SIM_SERVER_SUCCESS_NOTIFICATION);
 	} else {
 		eap_sim_state_enter(eap_session, EAP_SIM_SERVER_SUCCESS);
@@ -740,7 +740,7 @@ static rlm_rcode_t mod_process(UNUSED void *arg, eap_session_t *eap_session)
 		{
 			char buff[20];
 
-			vp = fr_pair_afrom_child_num(from_peer, dict_aka_root, FR_EAP_SIM_NOTIFICATION);
+			vp = fr_pair_afrom_child_num(from_peer, dict_sim_root, FR_EAP_SIM_NOTIFICATION);
 			if (!vp) {
 				REDEBUG2("Received SIM-Notification with no notification code");
 				eap_sim_state_enter(eap_session, EAP_SIM_SERVER_GENERAL_FAILURE_NOTIFICATION);
@@ -792,7 +792,7 @@ static rlm_rcode_t mod_process(UNUSED void *arg, eap_session_t *eap_session)
 		{
 			char buff[20];
 
-			vp = fr_pair_find_by_child_num(from_peer, dict_aka_root, FR_EAP_SIM_CLIENT_ERROR_CODE, TAG_ANY);
+			vp = fr_pair_find_by_child_num(from_peer, dict_sim_root, FR_EAP_SIM_CLIENT_ERROR_CODE, TAG_ANY);
 			if (!vp) {
 				REDEBUG("EAP-SIM Peer rejected SIM-Challenge with client-error message but "
 					"has not supplied a client error code");