From 926cbb0378e659f0fa8b4b1147d9a07d93b2cd46 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Jul 2025 12:38:38 +0200 Subject: [PATCH 1/5] NAS_CommonTypeDefs.ttcn: Fix wrong order of octetstring in Security Mode Complete ReplayedNASMessageContainer With that attribute, the octetstring showing up in ReplayedNASMessageContainer is in reverse order from that sent over the wire. --- ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn | 1 - 1 file changed, 1 deletion(-) diff --git a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn index 8c3dd55..1b77127 100644 --- a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn +++ b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn @@ -1276,7 +1276,6 @@ type record NBIFOMContainer { variant "FIELDORDER(msb)"; variant (iel) "LENGTHTO (replayedNASMsgContainerValue)"; variant (iel) "BYTEORDER(last)"; - variant (replayedNASMsgContainerValue) "BYTEORDER(last)"; }; type record NAS_SecurityAlgorithms { /* 24.301 cl. 9.9.3.23 */ -- GitLab From ea328f181f9abebba4e140acf8618c4b9b9dec54 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Jul 2025 12:12:42 +0200 Subject: [PATCH 2/5] NG_NAS_TypeDefs.ttcn: Fix wrong order of octetstrings in NG_SECURITY_PROTECTED_NAS_MESSAGE With those attributes, the octetstrings showing up in messageAuthenticationCode and plainNASMessage are in reverse order from those received over the wire. --- ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn | 2 -- 1 file changed, 2 deletions(-) diff --git a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn index 80881df..b4c2f0f 100644 --- a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn +++ b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn @@ -794,8 +794,6 @@ module NG_NAS_TypeDefs { NG_NAS_Message plainNASMessage /* cl. 9.9 M V 3-n */ } with { variant "FIELDORDER(msb)"; - variant (messageAuthenticationCode) "BYTEORDER(last)"; - variant (plainNASMessage) "BYTEORDER(last)"; } -- GitLab From f3c18cd928f850feb14bcfc7297aefe953f366f2 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Jul 2025 12:41:36 +0200 Subject: [PATCH 3/5] NG_NAS_TypeDefs.ttcn: Fix wrong order of octetstring in UplinkNASTransport Payload Container With that attribute, the octetstring showing up in ul_Nas_Transport.payload.payload is in reverse order from that sent over the wire --- ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn | 1 - 1 file changed, 1 deletion(-) diff --git a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn index b4c2f0f..34c9eb7 100644 --- a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn +++ b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn @@ -2030,7 +2030,6 @@ module NG_NAS_TypeDefs { variant "FIELDORDER(msb)"; variant (iel) "LENGTHTO (payload)"; variant (iel) "BYTEORDER(last)"; - variant (payload) "BYTEORDER(last)"; }; type record PayloadContainerType { /* 24.501 cl. 9.11.3.40 @sic R5w190208 sic@*/ -- GitLab From 6efd32361fd5645c0cc8c759308710a4416b4af3 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Jul 2025 12:46:09 +0200 Subject: [PATCH 4/5] NG_NAS_TypeDefs.ttcn: Fix wrong order of octetstring in PDUSessionEstReq dnnValue With that attribute, the octetstring showing up in dnnValue is in reverse order from that sent over the wire --- ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn | 2 -- 1 file changed, 2 deletions(-) diff --git a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn index 34c9eb7..4dab63a 100644 --- a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn +++ b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn @@ -1303,7 +1303,6 @@ module NG_NAS_TypeDefs { variant "FIELDORDER(msb)"; variant (iel) "LENGTHTO (dnnValue)"; variant (iel) "BYTEORDER(last)"; - variant (dnnValue) "BYTEORDER(last)"; }; type record EAP_Message { /* 24.501 cl. 9.11.2.2 */ @@ -1899,7 +1898,6 @@ module NG_NAS_TypeDefs { variant "FIELDORDER(msb)"; variant (dnnLength) "LENGTHTO (dnnValue, listOfPartialTais)"; variant (dnnLength) "BYTEORDER(last)"; - variant (dnnValue) "BYTEORDER(last)"; }; type record LADN_Info { /* 24.501 cl. 9.11.3.30 */ -- GitLab From 536ae17516e26c0641e6185b7c12bb7d70585675 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 21 Jul 2025 17:21:13 +0200 Subject: [PATCH 5/5] NG_NAS_TypeDefs.ttcn: fix enc/dec of pduSessionId as V instead of TV --- ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn index 4dab63a..f8249d2 100644 --- a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn +++ b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn @@ -923,6 +923,7 @@ module NG_NAS_TypeDefs { RSN rsn optional /* cl. 9.11.4.33 O TLV 3 IEI=35 Sep22 @sic R5s221179 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (integrityProtMaxDataRate) "FORCEOMIT(iei)"; variant "TAG(pduSessionType, iei = '9'H; sscMode, iei = 'A'H; @@ -975,6 +976,7 @@ module NG_NAS_TypeDefs { ReceivedMBSContainer receivedMBS optional /* cl. 9.11.4.31 O TLV-E 9-65538 IEI=71 Sep22 @sic R5s221179 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (sscMode) "FORCEOMIT(iei)"; variant (pduSessionType) "FORCEOMIT(iei)"; variant (authorizedQoSRules) "FORCEOMIT(iei)"; @@ -1016,6 +1018,7 @@ module NG_NAS_TypeDefs { ServiceLvlAAContainer serviceLvlAA optional /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (gsmCause) "FORCEOMIT(iei)"; variant "TAG(backOffTimerValue, iei = '37'O; allowedSSCMode, iei = 'F'H; @@ -1037,6 +1040,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (eapMessage) "FORCEOMIT(iei)"; variant "TAG(extdProtocolConfigurationOptions, iei = '7b'O)"; } @@ -1052,6 +1056,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (eapMessage) "FORCEOMIT(iei)"; variant "TAG(extdProtocolConfigurationOptions, iei = '7b'O)"; } @@ -1067,6 +1072,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(eapMessage, iei = '78'O; extdProtocolConfigurationOptions, iei = '7b'O)"; } @@ -1094,6 +1100,7 @@ module NG_NAS_TypeDefs { ServiceLvlAAContainer serviceLvlAA optional /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(smCapability, iei = '28'O; gsmCause, iei = '59'O; maxNumPacketFilters, iei = '55'O; @@ -1125,6 +1132,7 @@ module NG_NAS_TypeDefs { ReAttemptIndicator reattemptInd optional /* cl. 9.11.4.17 O TLV 3 IEI=1D Sep20 @sic R5s201387 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (gsmCause) "FORCEOMIT(iei)"; variant "TAG(backOffTimerValue, iei = '37'O; ngsmCongestionReattemptInd, iei = '61'O; @@ -1158,6 +1166,7 @@ module NG_NAS_TypeDefs { } with { // Check code for mappedEPSContexts: ETSI TS 124 501 V16.14.0 (2023-09) Table 8.3.7.1.1: PDU SESSION MODIFICATION REQUEST message content // Check code for mappedEPSContexts: ETSI TS 124 501 V16.14.0 (2023-09) Table 8.3.7.1.1 note variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(gsmCause, iei = '59'O; sessionAMBR, iei = '2A'O; rqTimerValue, iei = '56'O; @@ -1187,6 +1196,7 @@ module NG_NAS_TypeDefs { PortManagementInfoContainer portManagementInfoContainer optional /* cl. 9.11.4.27 O TLV-E 8-65538 IEI=74 Sep20 @sic R5s201387, R5s210444 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(extdProtocolConfigurationOptions, iei = '7B'O; portManagementInfoContainer, iei = '74'O; )"; @@ -1203,6 +1213,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (gsmCause) "FORCEOMIT(iei)"; variant "TAG(extdProtocolConfigurationOptions, iei = '7B'O)"; } @@ -1218,6 +1229,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(gsmCause, iei = '59'O; extdProtocolConfigurationOptions, iei = '7b'O)"; } @@ -1253,6 +1265,7 @@ module NG_NAS_TypeDefs { ServiceLvlAAContainer serviceLvlAA optional /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (gsmCause) "FORCEOMIT(iei)"; variant "TAG(backOffTimerValue, iei = '37'O; eapMessage, iei = '78'O; @@ -1274,6 +1287,7 @@ module NG_NAS_TypeDefs { ExtdProtocolConfigOptions extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant "TAG(gsmCause, iei = '59'O; extdProtocolConfigurationOptions, iei = '7b'O)"; } @@ -1288,6 +1302,7 @@ module NG_NAS_TypeDefs { GMM_GSM_Cause gsmCause /* cl. 9.11.4.2 M V 1 */ } with { variant "FIELDORDER(msb)"; + variant (pduSessionId) "FORCEOMIT(iei)"; variant (gsmCause) "FORCEOMIT(iei)"; } -- GitLab