Commit 5b67421a authored by canterburym's avatar canterburym
Browse files

TS 33108 v12.2.0 (2013-09-20) agreed at SA#61

parent b35a1049
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10) r8(8) version-1 (1)} 
CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10)  r12 (12) version-1 (1)} 

DEFINITIONS IMPLICIT TAGS ::=

@@ -39,7 +39,7 @@ securityDomain(2) lawfulIntercept(2)}

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r8(8) version-1(1)}
hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r12 (12) version-1(1)}

conf-sending-of-IRI  OPERATION ::= 
{
@@ -185,8 +185,8 @@ IMSIdentity ::= SEQUENCE
		sip-uri					[1] OCTET STRING 	OPTIONAL,
			-- See [REF 26 of 33.108]

		tel-url					[2] OCTET STRING 	OPTIONAL,
			-- See [REF 36 of 33.108]
		tel-uri					[2] OCTET STRING 	OPTIONAL,
			-- See [REF 67 of 33.108]

	...
}
+5 −5
Original line number Diff line number Diff line
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-1(1)} 
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-2(2)} 

DEFINITIONS IMPLICIT TAGS ::=

@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-1(1)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-2(2)}

eps-sending-of-IRI  OPERATION ::= 
{
@@ -208,8 +208,8 @@ PartyInformation ::= SEQUENCE
			-- See [26]

		...,
		tel-url					[9] OCTET STRING 	OPTIONAL,
			-- See [36]
		tel-uri					[9] OCTET STRING 	OPTIONAL,
			-- See [67]
        nai                    [10] OCTET STRING    OPTIONAL
            -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs]
	},
@@ -668,7 +668,7 @@ CCKeyInfo ::= SEQUENCE
	cCDecKey [2]	OCTET STRING,
	cCSalt   [3]    OCTET STRING OPTIONAL,
        -- The field reports the value from the CS_ID field in the ticket exchange headers as
        -- defined in IETF RFC 6043 [61] "draft-mattsson-mikey-ticket".
        -- defined in IETF RFC 6043 [61].
	...
} 

+4 −4
Original line number Diff line number Diff line
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-0 (0)} 
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-1 (1)} 

DEFINITIONS IMPLICIT TAGS ::=

@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r12(12) version-0 (0)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r12(12) version-1 (1)}

umts-sending-of-IRI  OPERATION ::= 
{
@@ -203,8 +203,8 @@ PartyInformation ::= SEQUENCE
			-- See [26]

		...,
		tel-url					[9] OCTET STRING 	OPTIONAL
			-- See [36]
		tel-uri					[9] OCTET STRING 	OPTIONAL
			-- See [67]
	},

	services-Data-Information 	[4] Services-Data-Information OPTIONAL,