Commit 4d53565c authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

validate2

parent ecd66ae6
Loading
Loading
Loading
Loading
+22 −22
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               ?,//?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ? // AuthorizationRequest
                    )));
@@ -125,7 +125,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               PX_AMF_UE_NGAP_ID,
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ? // SecurityModeCommand
                    )));
@@ -187,7 +187,7 @@ module NG_NAS_TCFunctions {
                        [] N2_gNBaMF_P.receive(
                                               mw_ngap_initMsg(
                                                               mw_n2_DownlinkNASTransport(
                                                                                          PX_AMF_UE_NGAP_ID,
                                                                                          ?,//PX_AMF_UE_NGAP_ID,
                                                                                          PX_RAN_UE_NGAP_ID,
                                                                                          ? // AuthorizationRequest
                                                ))) -> value v_PDU {
@@ -249,7 +249,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               PX_AMF_UE_NGAP_ID,
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ? // IdentityRequest
                    )));
@@ -319,7 +319,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               PX_AMF_UE_NGAP_ID,
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ?
                    )));
@@ -384,7 +384,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               PX_AMF_UE_NGAP_ID,
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ? // IdentityRequest
                    )));
@@ -436,7 +436,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_DownlinkNASTransport(
                                                                               PX_AMF_UE_NGAP_ID,
                                                                               ?,//PX_AMF_UE_NGAP_ID,
                                                                               PX_RAN_UE_NGAP_ID,
                                                                               ? // Security mode command
                    )));
@@ -484,7 +484,7 @@ module NG_NAS_TCFunctions {
                    f_recv_NGAP_PDU(
                                    mw_ngap_initMsg(
                                                    mw_n2_InitialContextSetupRequest_withPDUSessionList(
                                                                                                        PX_AMF_UE_NGAP_ID,
                                                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                                                        PX_RAN_UE_NGAP_ID,
                                                                                                        ? // Security mode command
                    )));
@@ -595,7 +595,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // PDU SESSION ESTABLISHMENT ACCEPT
                                )));
@@ -708,7 +708,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // AuthorizationRequest
                )));
@@ -825,7 +825,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // AuthorizationRequest
                )));
@@ -949,7 +949,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // AuthorizationRequest
                )));
@@ -1073,7 +1073,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // AuthorizationRequest
                )));
@@ -1193,7 +1193,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_DownlinkNASTransport(
                                                                        PX_AMF_UE_NGAP_ID,
                                                                        ?,//PX_AMF_UE_NGAP_ID,
                                                                        PX_RAN_UE_NGAP_ID,
                                                                        ? // AuthorizationRequest
                )));
@@ -1319,7 +1319,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1475,7 +1475,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1556,7 +1556,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1621,7 +1621,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1669,7 +1669,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1726,7 +1726,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1758,7 +1758,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
@@ -1814,7 +1814,7 @@ module NG_NAS_TCFunctions {
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            ?,//PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
+2 −1
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ module NG_NAS_SecurityFunctions {
    // Generation of String
    v_S := const_S6B_FC;
    //FC = 0x6B
    log("f_NG_Authentication_A4 (0): p_NID=", p_NID);
    v_P0 := fl_GetServingNetworkName(p_PLMN, p_NID); // @sic R5s220753 sic@
    log("f_NG_Authentication_A4 (1): v_P0=", v_P0);
    v_S :=  (v_S & v_P0);
+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ module LibNGAP_Functions {
        if (f_Check_5GAKA_NAS_DL_Message(
                                         vc_recvNAS_PDU,
                                         mw_NG_AUTHENTICATION_REQUEST(
                                                                      '100'B,
                                                                      ?,//'100'B,
                                                                      -,
                                                                      mw_GMM_AuthRAND,
                                                                      mw_GSM_AUTN
@@ -291,7 +291,7 @@ module LibNGAP_Functions {
        log("v_message: ", v_message);

        // Compute RES/XRES
        if (f_5g_aka_compute_res_xres(-, v_message.authentication_Request.rand.randValue, v_message.authentication_Request.autn.aUTN, v_message.authentication_Request.abba, PX_PLMN_IDENTITY, oct2hex(PX_SUPI_DIGITS), vc_ng_nas_security_params_type) == false) {
        if (f_5g_aka_compute_res_xres(-, v_message.authentication_Request.rand.randValue, v_message.authentication_Request.autn.aUTN, v_message.authentication_Request.abba, PX_PLMN_IDENTITY, -/*oct2hex(PX_SUPI_DIGITS)*/, vc_ng_nas_security_params_type) == false) {
            setverdict(fail);
            return;
        }
@@ -332,7 +332,7 @@ module LibNGAP_Functions {
        if (f_Check_5GAKA_NAS_DL_Message(
                                         vc_recvNAS_PDU,
                                         mw_NG_AUTHENTICATION_REQUEST(
                                                                      '00?'B,
                                                                      ?,//'00?'B,
                                                                      -,
                                                                      mw_GMM_AuthRAND,
                                                                      mw_GSM_AUTN
@@ -344,7 +344,7 @@ module LibNGAP_Functions {
        log("v_dl_message: ", v_dl_message);

        // Compute RES/XRES
        if (f_5g_aka_compute_res_xres(-, v_dl_message.authentication_Request.rand.randValue, v_dl_message.authentication_Request.autn.aUTN, v_dl_message.authentication_Request.abba, PX_PLMN_IDENTITY, oct2hex(PX_SUPI_DIGITS), vc_ng_nas_security_params_type) == false) {
        if (f_5g_aka_compute_res_xres(-, v_dl_message.authentication_Request.rand.randValue, v_dl_message.authentication_Request.autn.aUTN, v_dl_message.authentication_Request.abba, PX_PLMN_IDENTITY, -/*oct2hex(PX_SUPI_DIGITS)*/, vc_ng_nas_security_params_type) == false) {
            setverdict(fail);
            return;
        }
+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ module Lib_NG_NAS_Security_Functions {
                                           inout NG_NAS_SecurityParams_Type p_ng_nas_security_params_type
                                           ) return boolean {
            log(">>> f_5g_aka_compute_res_xres: ", p_ng_nas_security_params_type);
            log(">>> f_5g_aka_compute_res_xres: p_NID = ", p_NID);

            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);
+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ module Lib_NG_NAS_Functions {
        f_recv_NGAP_PDU(
                        mw_ngap_initMsg(
                                        mw_n2_DownlinkNASTransport(
                                                                   PX_AMF_UE_NGAP_ID,
                                                                   ?,//PX_AMF_UE_NGAP_ID,
                                                                   PX_RAN_UE_NGAP_ID,
                                                                   ? // AuthenticationRequest
        )));
@@ -111,7 +111,7 @@ module Lib_NG_NAS_Functions {
        if (f_Check_5GAKA_NAS_DL_Message(
                                         vc_recvNAS_PDU, 
                                         mw_NG_AUTHENTICATION_REQUEST(
                                                                     '100'B,
                                                                     ?,//'100'B,
                                                                     -,
                                                                     mw_GMM_AuthRAND,
                                                                     mw_GSM_AUTN
@@ -124,7 +124,7 @@ module Lib_NG_NAS_Functions {
        setverdict(pass);

        // Compute RES/XRES
        if (f_5g_aka_compute_res_xres(-, v_message.authentication_Request.rand.randValue, v_message.authentication_Request.autn.aUTN, v_message.authentication_Request.abba, PX_PLMN_IDENTITY, oct2hex(PX_SUPI_DIGITS), vc_ng_nas_security_params_type) == false) {
        if (f_5g_aka_compute_res_xres(-, v_message.authentication_Request.rand.randValue, v_message.authentication_Request.autn.aUTN, v_message.authentication_Request.abba, PX_PLMN_IDENTITY, -/*oct2hex(PX_SUPI_DIGITS)*/, vc_ng_nas_security_params_type) == false) {
            setverdict(fail);
            return;
        }