Commit 5adac94c authored by Yann Garcia's avatar Yann Garcia
Browse files

Editorial changes

parent d5c420aa
Loading
Loading
Loading
Loading
+12 −13
Original line number Diff line number Diff line
@@ -106,14 +106,14 @@ module Lib_NG_NAS_Security_Functions {
                var octetstring v_SequenceNumber := v_message.security_Protected_Nas_Message.sequenceNumber;//f_NasSecurity_ExtractSNfromCOUNT(v_message.security_Protected_Nas_Message.messageAuthenticationCode);
                log("f_Check_5GAKA_NAS_DL_Message: v_SequenceNumber: ", v_SequenceNumber);
                var octetstring v_Octet7toN := v_SequenceNumber & v_message.security_Protected_Nas_Message.plainNASMessage;
                var octetstring v_CalculatedMac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                var octetstring v_calculated_mac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                                                                               p_NasSecurityByRef.NAS_Integrity.Algorithm,
                                                                               p_NasSecurityByRef.NAS_Integrity.K_NAS,
                                                                               f_NG_NasSecurity_EstimateCOUNT(p_previous_nas_count_dl, oct2int(v_message.security_Protected_Nas_Message.sequenceNumber)),
                                                                               PX_BEARER_ID,
                                                                               tsc_DirectionDL);
                log("f_Check_5GAKA_NAS_DL_Message: v_CalculatedMac: ", v_CalculatedMac);
                if (v_CalculatedMac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                log("f_Check_5GAKA_NAS_DL_Message: v_calculated_mac: ", v_calculated_mac);
                if (v_calculated_mac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                    log("f_Check_5GAKA_NAS_DL_Message: Integrity check failed");
                    return false;
                }
@@ -126,14 +126,14 @@ module Lib_NG_NAS_Security_Functions {
                var octetstring v_SequenceNumber := f_NasSecurity_ExtractSNfromCOUNT(v_message.security_Protected_Nas_Message.messageAuthenticationCode);
                log("f_Check_5GAKA_NAS_DL_Message: v_SequenceNumber: ", v_SequenceNumber);
                var octetstring v_Octet7toN := v_SequenceNumber & v_message.security_Protected_Nas_Message.plainNASMessage;
                var octetstring v_CalculatedMac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                var octetstring v_calculated_mac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                                                                               p_NasSecurityByRef.NAS_Integrity.Algorithm,
                                                                               p_NasSecurityByRef.NAS_Integrity.K_NAS,
                                                                               f_NG_NasSecurity_EstimateCOUNT(p_previous_nas_count_dl, oct2int(v_message.security_Protected_Nas_Message.sequenceNumber)),
                                                                               PX_BEARER_ID,
                                                                               tsc_DirectionDL);
                log("f_Check_5GAKA_NAS_DL_Message: v_CalculatedMac: ", v_CalculatedMac);
                if (v_CalculatedMac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                log("f_Check_5GAKA_NAS_DL_Message: v_calculated_mac: ", v_calculated_mac);
                if (v_calculated_mac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                    log("f_Check_5GAKA_NAS_DL_Message: Integrity check failed");
                    return false;
                }
@@ -212,14 +212,14 @@ module Lib_NG_NAS_Security_Functions {
                var octetstring v_SequenceNumber := f_NasSecurity_ExtractSNfromCOUNT(v_message.security_Protected_Nas_Message.messageAuthenticationCode);
                log("f_Check_5GAKA_NAS_UL_Message: v_SequenceNumber: ", v_SequenceNumber);
                var octetstring v_Octet7toN := v_SequenceNumber & v_message.security_Protected_Nas_Message.plainNASMessage;
                var octetstring v_CalculatedMac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                var octetstring v_calculated_mac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                                                                               p_NasSecurityByRef.NAS_Integrity.Algorithm,
                                                                               p_NasSecurityByRef.NAS_Integrity.K_NAS,
                                                                               f_NG_NasSecurity_EstimateCOUNT(p_previous_nas_count_ul, oct2int(v_message.security_Protected_Nas_Message.sequenceNumber)),
                                                                               PX_BEARER_ID,
                                                                               tsc_DirectionDL);
                log("f_Check_5GAKA_NAS_UL_Message: v_CalculatedMac: ", v_CalculatedMac);
                if (v_CalculatedMac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                log("f_Check_5GAKA_NAS_UL_Message: v_calculated_mac: ", v_calculated_mac);
                if (v_calculated_mac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                    log("f_Check_5GAKA_NAS_UL_Message: Integrity check failed");
                    return false;
                }
@@ -237,14 +237,14 @@ module Lib_NG_NAS_Security_Functions {
                var octetstring v_SequenceNumber := f_NasSecurity_ExtractSNfromCOUNT(v_message.security_Protected_Nas_Message.messageAuthenticationCode);
                log("f_Check_5GAKA_NAS_UL_Message: v_SequenceNumber: ", v_SequenceNumber);
                var octetstring v_Octet7toN := v_SequenceNumber & v_message.security_Protected_Nas_Message.plainNASMessage;
                var octetstring v_CalculatedMac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                var octetstring v_calculated_mac := fx_NG_NasIntegrityAlgorithm(v_Octet7toN,
                                                                               p_NasSecurityByRef.NAS_Integrity.Algorithm,
                                                                               p_NasSecurityByRef.NAS_Integrity.K_NAS,
                                                                               f_NG_NasSecurity_EstimateCOUNT(p_previous_nas_count_ul, oct2int(v_message.security_Protected_Nas_Message.sequenceNumber)),
                                                                               PX_BEARER_ID,
                                                                               tsc_DirectionUL);
                log("f_Check_5GAKA_NAS_UL_Message: v_CalculatedMac: ", v_CalculatedMac);
                if (v_CalculatedMac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                log("f_Check_5GAKA_NAS_UL_Message: v_calculated_mac: ", v_calculated_mac);
                if (v_calculated_mac != v_message.security_Protected_Nas_Message.messageAuthenticationCode) {
                    log("f_Check_5GAKA_NAS_UL_Message: Integrity check failed");
                    return false;
                }
@@ -393,7 +393,6 @@ module Lib_NG_NAS_Security_Functions {
                                           ) return boolean {
            log(">>> f_5g_aka_compute_res_xres: p_ng_nas_security_params_type: ", p_ng_nas_security_params_type);
            log(">>> f_5g_aka_compute_res_xres: p_Identity: ", p_Identity);
            log(">>> f_5g_aka_compute_res_xres: p_Identity: ", hex2str(p_Identity));

            p_ng_nas_security_params_type := valueof(cs_NG_NAS_SecurityParamsInit);
            log("f_5g_aka_compute_res_xres: KDF=", p_ng_nas_security_params_type.KDF);