Commit 15b9f4a9 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Resolving merge conflict

parents 23188cdf 718496f4

103280/TS_103_280.asn1

+17 −17
Original line number Diff line number Diff line
@@ -7,14 +7,24 @@ DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN 


commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}



-- XXX Temporary stubs for TS 102 232-1 CR 124. Remove once MR !328 for TS 103 280 CR 042 is merged.

ShortString ::= NULL

LongString ::= NULL



-- Common Parameters (below are as defined in clause 6)

-- Common Parameters (below are as defined in order in clause 6)



LIID ::= OCTET STRING (SIZE (1..25))



QualifiedDateTime ::= GeneralizedTime



QualifiedMicrosecondDateTime ::= GeneralizedTime



InternationalE164 ::= NumericString (SIZE(1..15))



IMSI ::= NumericString (SIZE(6..15))



IMEI ::= NumericString (SIZE(14))



IMEICheckDigit ::= NumericString (SIZE(15))



IMEISV ::= NumericString (SIZE(16))



TCPPort ::= INTEGER (1..65535)



TCPPortRange ::= SEQUENCE
@@ -43,9 +53,9 @@ PortRange ::= CHOICE 
    uDPPortRange [1] UDPPortRange

}



QualifiedDateTime ::= GeneralizedTime

ShortString ::= UTF8String (SIZE (0..255))



QualifiedMicrosecondDateTime ::= GeneralizedTime

LongString ::= UTF8String (SIZE (0..65535))



WGS84CoordinateDecimal ::= SEQUENCE

{
@@ -67,16 +77,6 @@ WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) 


WGS84LongitudeAngular ::= OCTET STRING (SIZE (11))



InternationalE164 ::= NumericString (SIZE(1..15))



IMSI ::= NumericString (SIZE(6..15))



IMEI ::= NumericString (SIZE(14))



IMEICheckDigit ::= NumericString (SIZE(15))



IMEISV ::= NumericString (SIZE(16))



SUPIIMSI ::= IMSI



SUPINAI ::= NAI

103280/TS_103_280.xsd

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
    </xs:simpleType>

    <xs:simpleType name="IPv6CIDR">

        <xs:restriction base="xs:token">

            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))"/>

            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9]?[0-9])|(1[0-1][0-9])|(12[0-8]))"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:complexType name="IPAddress">

temp.asn

0 → 100644
+819 −0

File added.

Preview size limit exceeded, changes collapsed.