Commit 2bf02d5a authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA100' into 'main' 

Output from SA#100

See merge request !163
parents 57a65cb4 8f515dbb

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ generate_artefacts: 
    - echo $CI_MERGE_REQUEST_IID

    - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

    - echo $ARTEFACT_NAME

    - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID

    - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_MERGE_REQUEST_IID

  artifacts:

    untracked: true

    paths:

33108/r16/CONF-HI3-IMS.asn

+9 −9
Original line number Diff line number Diff line 
CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11)  r13 (13) version-0 (0)}

CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11)  r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -20,12 +20,12 @@ ConfPartyInformation 


	FROM CONFHI2Operations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)

    threeGPP(4) hi2conf(10)   r13 (13) version-0 (0)}

    threeGPP(4) hi2conf(10)   r16 (16) version-0 (0)}

    -- Imported from Conf HI2 Operations part of this standard



National-HI3-ASN1parameters

    FROM Eps-HI3-PS

    {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)  r12(12) version-55 (55)};

    {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)  r16(16) version-0 (0)};

-- Imported form EPS HI3 part of this standard



-- Object Identifier Definitions
@@ -36,7 +36,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11)  r13 (13) version-0 (0)}

hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11)  r16 (16) version-0 (0)}



Conf-CC-PDU	::= SEQUENCE

{

33108/r16/CSvoice-HI3-IP.asn

+13 −13
Original line number Diff line number Diff line 
CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)  r14 (14) version-0 (0)}

CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)  r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -17,12 +17,12 @@ IMPORTS 


	-- from 3GPPEps-HI3-PS TS 33.108

	National-HI3-ASN1parameters

		FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r14 (14) version-0 (0)}

		FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16 (16) version-0 (0)}



	-- from VoIP-HI3-IMS TS 33.108

	Payload-description,

	TPDU-direction

		FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r14(14) version-0(0)};

		FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r16(16) version-0(0)};



-- Object Identifier Definitions
@@ -32,7 +32,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3CSvoiceDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3CSvoice(18) r14(14) version-0 (0)}

hi3CSvoiceDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3CSvoice(18) r16(16) version-0 (0)}



CSvoice-CC-PDU	::= SEQUENCE

{

33108/r16/Eps-HI3-PS.asn

+6 −6
Original line number Diff line number Diff line 
Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)  r12(12) version-0(0)}

Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)  r16(16) version-0(0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -8,7 +8,7 @@ IMPORTS 


EPSCorrelationNumber

	FROM EpsHI2Operations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) 	hi2eps(8) r12(12) version-55(55)}    -- Imported from TS 33.108 v.12.5.0

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) 	hi2eps(8) r16(16) version-1(1)}    -- Imported from TS 33.108 v.16.4.0



LawfulInterceptionIdentifier,
@@ -24,7 +24,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3DomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3eps(9) r12(12) version-0(0)}

hi3DomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3eps(9) r16(16) version-0(0)}



CC-PDU	::= SEQUENCE

{

33108/r16/GCSE-HI3.asn

+9 −9
Original line number Diff line number Diff line 
GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r13(13) version-0(0)}

GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r16(16) version-0(0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -17,13 +17,13 @@ GcsePartyIdentity 


	FROM GCSEHI2Operations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)

    threeGPP(4) hi2gcse(13)  r13(13) version-0 (0)}

    threeGPP(4) hi2gcse(13)  r16(16) version-0 (0)}

    -- Imported from Gcse HI2 Operations part of this standard



National-HI3-ASN1parameters



	FROM Eps-HI3-PS

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) 	threeGPP(4) hi3eps(9) r12 (12) version-0(0)};

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) 	threeGPP(4) hi3eps(9) r16 (16) version-0(0)};



-- Object Identifier Definitions
@@ -33,7 +33,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3gcseDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3gcse(14) r13(13) version-0(0)}

hi3gcseDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3gcse(14) r16(16) version-0(0)}



Gcse-CC-PDU	::= SEQUENCE

{