Commit 0407c3bb authored by Yann Garcia's avatar Yann Garcia
Browse files

Fixed merge issues

parent c9b10b91

ttcn/Ats_NG_NAS/NG_NAS_TCFunctions.ttcn

+0 −4
Original line number Diff line number Diff line
@@ -125,11 +125,7 @@ module NG_NAS_TCFunctions { 
                    f_recv_NGAP_PDU(

                                    mw_ngap_initMsg(

                                                    mw_n2_DownlinkNASTransport(

<<<<<<< HEAD

                                                                               ?,//PX_AMF_UE_NGAP_ID,

=======

                                                                               ?,// Set by AMF - PX_AMF_UE_NGAP_ID,

>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0

                                                                               PX_RAN_UE_NGAP_ID,

                                                                               ? // SecurityModeCommand

                    )));

ttcn/LibNGAP/lib_system/LibNGAP_Functions.ttcn

+0 −4
Original line number Diff line number Diff line
@@ -332,11 +332,7 @@ module LibNGAP_Functions { 
        if (f_Check_5GAKA_NAS_DL_Message(

                                         vc_recvNAS_PDU,

                                         mw_NG_AUTHENTICATION_REQUEST(

<<<<<<< HEAD

                                                                      ?,//'00?'B,

=======

                                                                      -, //'00?'B,

>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0

                                                                      -,

                                                                      mw_GMM_AuthRAND,

                                                                      mw_GSM_AUTN

ttcn/Lib_NG_NAS/lib/Lib_NG_NAS_Security_Functions.ttcn

+0 −5
Original line number Diff line number Diff line
@@ -200,11 +200,6 @@ 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);

<<<<<<< HEAD

            log(">>> f_5g_aka_compute_res_xres: p_NID = ", p_NID);

=======

            log(">>> f_5g_aka_compute_res_xres: p_NID: ", p_NID);

>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0



            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);