Commit 1441327d authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

enc/dec change nasSecurityProtectedNAS message variant oe OTHERWISE

parent 28066cde

ttcn/Lib3GPP/NG_NAS/NG_NAS_MsgContainers.ttcn

+37 −10
Original line number Diff line number Diff line
@@ -58,10 +58,6 @@ module NG_NAS_MsgContainers 
    UE_TEST_LOOP_NR_SIDELINK_COUNTER_RESPONSE              test_Loop_Sidelink_Counter_Response // @sic R5-225291 sic@

  } with { // FIXME FSCOM Check messageType for deregistration_RequestMO

    variant "TAG(

      security_Protected_Nas_Message,                 securityHeaderType = '0001'B;

      security_Protected_Nas_Message,                 securityHeaderType = '0010'B;

      security_Protected_Nas_Message,                 securityHeaderType = '0011'B;

      security_Protected_Nas_Message,                 securityHeaderType = '0100'B;

      authentication_Failure,                         messageType = '01011001'B;

      authentication_Response,                        messageType = '01010111'B;

      configuration_Update_Complete,                  messageType = '01010101'B;
@@ -74,7 +70,7 @@ module NG_NAS_MsgContainers 
      identity_Response,                              messageType = '01011100'B;

      notification_Response,                          messageType = '01100110'B;

      pdu_Session_Authentication_Complete,            messageType = '11000110'B;

      pdu_Session_Establishment_Request,              {protocolDiscriminator = '00101110'B, messageType = '11000001'B};

      pdu_Session_Establishment_Request,              messageType = '11000001'B;

      pdu_Session_Modification_Command_Reject,        messageType = '11001101'B;

      pdu_Session_Modification_Complete,              messageType = '11001100'B;

      pdu_Session_Modification_Request,               messageType = '11001001'B;
@@ -86,9 +82,39 @@ module NG_NAS_MsgContainers 
      security_Mode_Reject,                           messageType = '01011111'B;

      service_Request,                                messageType = '01001100'B;

      ul_Nas_Transport,                               messageType = '01100111'B;

      security_Protected_Nas_Message,                 OTHERWISE

      )"



  }

  //security_Protected_Nas_Message,                 {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0001'B};

      //security_Protected_Nas_Message,                 {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0010'B};

      //security_Protected_Nas_Message,                 {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0011'B};

      //security_Protected_Nas_Message,                 {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0100'B};

//        authentication_Failure,                         messageType = '01011001'B;

      // authentication_Response,                        messageType = '01010111'B;

      // configuration_Update_Complete,                  messageType = '01010101'B;

      // cp_Service_Request,                             messageType = '01001111'B;

      // deregistration_Accept,                          messageType = '01000110'B;

      // deregistration_RequestMO,                       messageType = '01000101'B;

      // gmm_Status,                                     messageType = '01100100'B;

      // gsm_Status,                                     messageType = '11010110'B;

      // network_Slice_Specific_Authentication_Complete, messageType = '01010001'B;

      // identity_Response,                              messageType = '01011100'B;

      // notification_Response,                          messageType = '01100110'B;

      // pdu_Session_Authentication_Complete,            messageType = '11000110'B;

      // pdu_Session_Establishment_Request,              {protocolDiscriminator = '00101110'B, messageType = '11000001'B};

      // pdu_Session_Modification_Command_Reject,        messageType = '11001101'B;

      // pdu_Session_Modification_Complete,              messageType = '11001100'B;

      // pdu_Session_Modification_Request,               messageType = '11001001'B;

      // pdu_Session_Release_Complete,                   messageType = '11010100'B;

      // pdu_Session_Release_Request,                    messageType = '11010001'B;

      // registration_Request,                           {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01000001'B};

      // registration_Complete,                          {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01000011'B};

      // security_Mode_Complete,                         {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01011110'B};

      // security_Mode_Reject,                           {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01011111'B};

      // service_Request,                                {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01001100'B};

      // ul_Nas_Transport,                               {protocolDiscriminator = '01111110'B, spareHalfOctet = '0'H, securityHeaderType = '0000'B, messageType = '01100111'B};

      // security_Protected_Nas_Message,                 OTHERWISE   



  type union NG_NAS_DL_Message_Type {                                              /* NAS message with direction 'network to UE' or 'both' */

    NG_SECURITY_PROTECTED_NAS_MESSAGE                      security_Protected_Nas_Message,
@@ -136,10 +162,6 @@ module NG_NAS_MsgContainers 


  } with { // FIXME FSCOM Check messageType for deregistration_RequestMT

    variant "TAG(

      security_Protected_Nas_Message,                securityHeaderType = '0001'B;

      security_Protected_Nas_Message,                securityHeaderType = '0010'B;

      security_Protected_Nas_Message,                securityHeaderType = '0011'B;

      security_Protected_Nas_Message,                securityHeaderType = '0100'B;

      authentication_Reject,                         messageType = '01011000'B;

      authentication_Request,                        messageType = '01010110'B;

      authentication_Result,                         messageType = '01011010'B;
@@ -166,8 +188,13 @@ module NG_NAS_MsgContainers 
      security_Mode_Command,                         messageType = '01011101'B;

      service_Accept,                                messageType = '01001110'B;

      service_Reject,                                messageType = '01001101'B;

      security_Protected_Nas_Message,                OTHERWISE

      )"

    }

      //security_Protected_Nas_Message,                securityHeaderType = '0001'B;

      //security_Protected_Nas_Message,                securityHeaderType = '0010'B;

      //security_Protected_Nas_Message,                securityHeaderType = '0011'B;

      //security_Protected_Nas_Message,                securityHeaderType = '0100'B;

      

  //****************************************************************************

  // NAS SECURITY PROTECTION