Fixing merge conflict (436b23cc) · Commits · LI - Lawful Interception / TC LI schemas definitions

103280/TS_103_280.asn1

+70 −0

Original line number	Original line	Diff line number	Diff line
	@@ -97,4 +97,74 @@ VLANID ::= INTEGER (0..4095)

	ServiceAccessIdentifier ::= UTF8String		ServiceAccessIdentifier ::= UTF8String

			Percentage ::= INTEGER (0..100)

			AltitudeMeters ::= INTEGER (-1000..50000)

			Altitude ::= CHOICE
			{
			altitudeAboveGroundLevel [0] AltitudeMeters,
			altitudeAboveMeanSeaLevel [1] AltitudeMeters
			}

			UncertaintyMeters ::= INTEGER (1..MAX)

			GNSSLocation ::= SEQUENCE
			{
			location [0] GeoShape,
			fixMode [1] FixMode
			}

			WGS84Location ::= SEQUENCE
			{
			location [0] WGS84Coordinate,
			altitude [1] Altitude OPTIONAL
			}

			WGS84Coordinate ::= CHOICE
			{
			decimal [0] Common-Parameters.WGS84CoordinateDecimal,
			angular [1] Common-Parameters.WGS84CoordinateAngular
			}

			GeoShape ::= SEQUENCE
			{
			shape [0] GMLShape,
			confidence [1] Percentage OPTIONAL
			}

			GMLShape ::= CHOICE
			{
			point [0] GeoPoint,
			sphere [1] GeoSphere,
			xyEllipsoid [2] XYEllipsoid
			}

			GeoPoint ::= CHOICE
			{
			wGS84Point [0] WGS84Location
			}

			GeoSphere ::= SEQUENCE
			{
			centerPoint [0] GeoPoint,
			radiusMeters [1] UncertaintyMeters
			}

			XYEllipsoid ::= SEQUENCE
			{
			centerPoint [0] GeoPoint,
			uncertaintyLongitude [1] UncertaintyMeters,
			uncertaintyLatitude [2] UncertaintyMeters,
			uncertaintyAltitude [3] UncertaintyMeters OPTIONAL
			}

			FixMode ::= ENUMERATED
			{
			unknown (0),
			noFix (1),
			fix2D (2),
			fix3D (3)
			}

	END		END

103280/TS_103_280.xsd

+81 −0

Original line number	Original line	Diff line number	Diff line
	@@ -313,4 +313,85 @@
	<xs:simpleType name="VRF">		<xs:simpleType name="VRF">
	<xs:restriction base="ShortString"/>		<xs:restriction base="ShortString"/>
	</xs:simpleType>		</xs:simpleType>
			<xs:simpleType name="Percentage">
			<xs:restriction base="xs:integer">
			<xs:minInclusive value="0"/>
			<xs:maxInclusive value="100"/>
			</xs:restriction>
			</xs:simpleType>
			<xs:simpleType name="AltitudeMeters">
			<xs:restriction base="xs:integer">
			<xs:minInclusive value="-1000"/>
			<xs:maxInclusive value="50000"/>
			</xs:restriction>
			</xs:simpleType>
			<xs:complexType name="Altitude">
			<xs:choice>
			<xs:element name="altitudeAboveGroundLevel" type="AltitudeMeters"/>
			<xs:element name="altitudeAboveMeanSeaLevel" type="AltitudeMeters"/>
			</xs:choice>
			</xs:complexType>
			<xs:simpleType name="UncertaintyMeters">
			<xs:restriction base="xs:integer">
			<xs:minInclusive value="1"/>
			</xs:restriction>
			</xs:simpleType>
			<xs:complexType name="GNSSLocation">
			<xs:sequence>
			<xs:element name="location" type="GeoShape"/>
			<xs:element name="fixMode" type="FixMode"/>
			</xs:sequence>
			</xs:complexType>
			<xs:complexType name="WGS84Location">
			<xs:sequence>
			<xs:element name="location" type="WGS84Coordinate"/>
			<xs:element name="altitude" type="Altitude" minOccurs="0"/>
			</xs:sequence>
			</xs:complexType>
			<xs:complexType name="WGS84Coordinate">
			<xs:choice>
			<xs:element name="wGS84CoordinateDecimal" type="WGS84CoordinateDecimal"/>
			<xs:element name="wGS84CoordinateAngular" type="WGS84CoordinateAngular"/>
			</xs:choice>
			</xs:complexType>
			<xs:complexType name="GeoShape">
			<xs:sequence>
			<xs:element name="shape" type="GMLShape"/>
			<xs:element name="confidence" type="Percentage" minOccurs="0"/>
			</xs:sequence>
			</xs:complexType>
			<xs:complexType name="GMLShape">
			<xs:choice>
			<xs:element name="point" type="GeoPoint"/>
			<xs:element name="sphere" type="GeoSphere"/>
			<xs:element name="xyEllipsoid" type="XYEllipsoid"/>
			</xs:choice>
			</xs:complexType>
			<xs:complexType name="GeoPoint">
			<xs:choice>
			<xs:element name="wGS84Point" type="WGS84Location"/>
			</xs:choice>
			</xs:complexType>
			<xs:complexType name="GeoSphere">
			<xs:sequence>
			<xs:element name="centerPoint" type="GeoPoint"/>
			<xs:element name="radiusMeters" type="UncertaintyMeters"/>
			</xs:sequence>
			</xs:complexType>
			<xs:complexType name="XYEllipsoid">
			<xs:sequence>
			<xs:element name="centerPoint" type="GeoPoint"/>
			<xs:element name="uncertaintyLongitude" type="UncertaintyMeters"/>
			<xs:element name="uncertaintyLatitude" type="UncertaintyMeters"/>
			<xs:element name="uncertaintyAltitude" type="UncertaintyMeters" minOccurs="0"/>
			</xs:sequence>
			</xs:complexType>
			<xs:simpleType name="FixMode">
			<xs:restriction base="xs:string">
			<xs:enumeration value="unknown"/>
			<xs:enumeration value="noFix"/>
			<xs:enumeration value="fix2D"/>
			<xs:enumeration value="fix3D"/>
			</xs:restriction>
			</xs:simpleType>
	</xs:schema>		</xs:schema>

104144/examples/form1_encryptionRequested.xml

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -235,7 +235,11 @@
	<AssociatedObjects>		<AssociatedObjects>
	<AssociatedObject>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</AssociatedObject>		<AssociatedObject>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</AssociatedObject>
	</AssociatedObjects>		</AssociatedObjects>
	<encryption:EncryptionScheme>ExampleEncryptionScheme</encryption:EncryptionScheme>		<encryption:EncryptionScheme>
			<common:Owner>ETSI</common:Owner>
			<common:Name>EncryptionScheme</common:Name>
			<common:Value>ExampleValue</common:Value>
			</encryption:EncryptionScheme>
	<encryption:X509EncryptionDetails>		<encryption:X509EncryptionDetails>
	<encryption:X509Certificates>		<encryption:X509Certificates>
	<encryption:X509CertificateDER>MIIFrzCCA5egAwIBAgIUNnW+dC3d9OE7TYYMSrLqtrWq5SEwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAsME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAMME2lzc3VpbmctYXV0aG9yaXR5LTEwHhcNMjYwMTA1MTIyNzM5WhcNMjcwMTA1MTIyNzM5WjBnMQswCQYDVQQGEwJERTEcMBoGA1UECgwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UECwwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UEAwwTaXNzdWluZy1hdXRob3JpdHktMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOOf2/Ff0XsKLi/fqrfa1W6jG20c1M2v945jpcJ4symsXDZ7+Q17fs6hMDzfetFc9r2sy9lIF0v9Rd3yMnMwBCywKVDRFbPeRcYLXUzNyB99Vhza7g6tK20DcxnCTk/TZpII6sdnLUw3yQsB5awrRf1mUMtYZ7nqjMhNFvMNEmKIEStB/O4yvAZMjr69DQMtORFZjDUR4RMxBRzl6Hh+G/SGnFnAFhlc0mF24sX5JdpnY9mw5C2ZT/MSbBvzFz3DsOSenmeW2WyF6xnZt+LSKjEdpbyII9W+3rqB7h9dkHm8oyKHEilfk/vXbfh94pXydFrC7cTSJOiEWBiviidgvnCcdM6Ih/MjYcE+MDq4qjgfYPv+HpBL/QM3obN4ko3tx2pO74mPKvubqJnlbCm23VLgRA8wqARytzhxpUULUa3IvAloDIdi/sKT4pk112ncz/tcScCVn0vzLJE8LEIqvypJxxQyvaTFItw3ZtNsAsdv3tbEz9jvAVJSng5fEKJvj4AezB2RPDPZIF5mTcZd/uhH+S+a1WjTi9yqoEW1hmpom3krIxaLf5Th6QuBKo/02dkK7J1zhYIBVI6Fj8R+AraN8QMoq5EOKNspgrFqc57XKRt5MFsBCf0pVnqY4rEjFnxI/eH1FpC1fby9JEhBaVhI7cDhR7wV756HQ67svteDAgMBAAGjUzBRMB0GA1UdDgQWBBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAfBgNVHSMEGDAWgBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBN74VlUuAivHF56nYhCgdItCKThGG0zEmy2HwbJ+BGK9gLouMSBnw/uxfC+lM6+GWd4hmDqWOgpyUpCu9CD0grElguEjWwbr2jhZRLFxNZNV22XLyRgDsF3rGaJIc6t2VNmiKZzpKQ13CnIKXJ8Sfpt/9UktBYSwD0c9YnEJ6+M5pjz3NKYZakIlRw+ucfzE5H0cipT4hjomUyc2kUR7POZKG7SlEG10G3RnMt0N7b/dTHGdGshZkU3RmWUMGoNroF1ke25yRgN/chxDub+fhJSX7J9vt8lyb3IR3pMoomJJ/rDF23Iips038ZA0LvrdmzAT/+VRvcLkLY7bh9qmM6Zt9YBztrVuBUsgDr67m4waTlU6gC06SQJa+pdx4UJAjtwV23BX1tX+tlrED+1/F7cBe3RPJRESvejB2VibvYYvE34wMgYoMnATuJHDpD+o0a2NDy6dGwGgFs5Oy2QxBq5+f7Bl2z1o2FuAAeQKtwKwWFCPH2ARTRb1kadBSqDAFw9uJGzufX8kseSzvJkfKcG/qJxxzSp1aD8T+MNjwGF09BJ4IthuqcpkmcoOoWHJ+v3qwnhoGqAasI4j25qyYosHp3HtKN4HN5L90SjP1e5IJZWCWZQY1/H/qTss84Y3Gi3AOIQgSpc2zwiH9+gQ51btIifB8+yQJdLXHHqa+nAg==</encryption:X509CertificateDER>		<encryption:X509CertificateDER>MIIFrzCCA5egAwIBAgIUNnW+dC3d9OE7TYYMSrLqtrWq5SEwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAsME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAMME2lzc3VpbmctYXV0aG9yaXR5LTEwHhcNMjYwMTA1MTIyNzM5WhcNMjcwMTA1MTIyNzM5WjBnMQswCQYDVQQGEwJERTEcMBoGA1UECgwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UECwwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UEAwwTaXNzdWluZy1hdXRob3JpdHktMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOOf2/Ff0XsKLi/fqrfa1W6jG20c1M2v945jpcJ4symsXDZ7+Q17fs6hMDzfetFc9r2sy9lIF0v9Rd3yMnMwBCywKVDRFbPeRcYLXUzNyB99Vhza7g6tK20DcxnCTk/TZpII6sdnLUw3yQsB5awrRf1mUMtYZ7nqjMhNFvMNEmKIEStB/O4yvAZMjr69DQMtORFZjDUR4RMxBRzl6Hh+G/SGnFnAFhlc0mF24sX5JdpnY9mw5C2ZT/MSbBvzFz3DsOSenmeW2WyF6xnZt+LSKjEdpbyII9W+3rqB7h9dkHm8oyKHEilfk/vXbfh94pXydFrC7cTSJOiEWBiviidgvnCcdM6Ih/MjYcE+MDq4qjgfYPv+HpBL/QM3obN4ko3tx2pO74mPKvubqJnlbCm23VLgRA8wqARytzhxpUULUa3IvAloDIdi/sKT4pk112ncz/tcScCVn0vzLJE8LEIqvypJxxQyvaTFItw3ZtNsAsdv3tbEz9jvAVJSng5fEKJvj4AezB2RPDPZIF5mTcZd/uhH+S+a1WjTi9yqoEW1hmpom3krIxaLf5Th6QuBKo/02dkK7J1zhYIBVI6Fj8R+AraN8QMoq5EOKNspgrFqc57XKRt5MFsBCf0pVnqY4rEjFnxI/eH1FpC1fby9JEhBaVhI7cDhR7wV756HQ67svteDAgMBAAGjUzBRMB0GA1UdDgQWBBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAfBgNVHSMEGDAWgBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBN74VlUuAivHF56nYhCgdItCKThGG0zEmy2HwbJ+BGK9gLouMSBnw/uxfC+lM6+GWd4hmDqWOgpyUpCu9CD0grElguEjWwbr2jhZRLFxNZNV22XLyRgDsF3rGaJIc6t2VNmiKZzpKQ13CnIKXJ8Sfpt/9UktBYSwD0c9YnEJ6+M5pjz3NKYZakIlRw+ucfzE5H0cipT4hjomUyc2kUR7POZKG7SlEG10G3RnMt0N7b/dTHGdGshZkU3RmWUMGoNroF1ke25yRgN/chxDub+fhJSX7J9vt8lyb3IR3pMoomJJ/rDF23Iips038ZA0LvrdmzAT/+VRvcLkLY7bh9qmM6Zt9YBztrVuBUsgDr67m4waTlU6gC06SQJa+pdx4UJAjtwV23BX1tX+tlrED+1/F7cBe3RPJRESvejB2VibvYYvE34wMgYoMnATuJHDpD+o0a2NDy6dGwGgFs5Oy2QxBq5+f7Bl2z1o2FuAAeQKtwKwWFCPH2ARTRb1kadBSqDAFw9uJGzufX8kseSzvJkfKcG/qJxxzSp1aD8T+MNjwGF09BJ4IthuqcpkmcoOoWHJ+v3qwnhoGqAasI4j25qyYosHp3HtKN4HN5L90SjP1e5IJZWCWZQY1/H/qTss84Y3Gi3AOIQgSpc2zwiH9+gQ51btIifB8+yQJdLXHHqa+nAg==</encryption:X509CertificateDER>

Admin message