Commit 218b1f63 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 232-2 v3.7.1 (2014-02-21) agreed at LI#35 (Milan, 2014-01-28)

parent 70cafce7
Loading
Loading
Loading
Loading
+9 −7
Original line number Original line Diff line number Diff line
EmailPDU
EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
BEGIN
@@ -9,7 +9,7 @@ IMPORTS
	-- from TS 101 671 [4]
	-- from TS 101 671 [4]
	IPAddress
	IPAddress
		FROM HI2Operations
		FROM HI2Operations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}


	-- from TS 102 232-5 [38]
	-- from TS 102 232-5 [38]
	IPMMCC
	IPMMCC
@@ -21,11 +21,11 @@ IMPORTS
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================


emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) iRI(1)}
emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version13(13) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) cC(2)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version13(13) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingIRI(3)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version13(13) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingCC(4)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version13(13) messagingCC(4)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version12(12) messagingMMCC(5)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version13(13) messagingMMCC(5)}


	-- definitions are relative to 
	-- definitions are relative to 
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -125,6 +125,8 @@ E-mail-Protocol ::= ENUMERATED
	smtp(1),
	smtp(1),
	pop3(2),
	pop3(2),
	imap4(3),
	imap4(3),
	webmail(4),
		-- See Annex H for more information
	undefined(255),
	undefined(255),
		-- The protocol is not known or not representable by the current enumeration
		-- The protocol is not known or not representable by the current enumeration
	...
	...
+9 −7
Original line number Original line Diff line number Diff line
EmailPDU
EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
BEGIN
@@ -9,7 +9,7 @@ IMPORTS
	-- from TS 101 671 [4]
	-- from TS 101 671 [4]
	IPAddress
	IPAddress
		FROM HI2Operations
		FROM HI2Operations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}


	-- from TS 102 232-5 [38]
	-- from TS 102 232-5 [38]
	IPMMCC
	IPMMCC
@@ -21,11 +21,11 @@ IMPORTS
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================


emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) iRI(1)}
emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version13(13) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) cC(2)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version13(13) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingIRI(3)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version13(13) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingCC(4)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version13(13) messagingCC(4)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version12(12) messagingMMCC(5)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version13(13) messagingMMCC(5)}


	-- definitions are relative to 
	-- definitions are relative to 
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -125,6 +125,8 @@ E-mail-Protocol ::= ENUMERATED
	smtp(1),
	smtp(1),
	pop3(2),
	pop3(2),
	imap4(3),
	imap4(3),
	webmail(4),
		-- See Annex H for more information
	undefined(255),
	undefined(255),
		-- The protocol is not known or not representable by the current enumeration
		-- The protocol is not known or not representable by the current enumeration
	...
	...