From 2785d8195f432f3025c89ddccd8e558442a8a01e Mon Sep 17 00:00:00 2001
From: filatov <filatov@5a941883-869f-0410-b6e7-a816b635d326>
Date: Tue, 19 Jul 2016 13:42:57 +0000
Subject: [PATCH] add IS ITS IDa in certificate profiles

---
 data/profiles/CERT_TEST_ROOT.xml      |  9 +++++++--
 data/profiles/CERT_TS_01_03_BO_AA.xml |  4 ++--
 data/profiles/CERT_TS_01_03_BO_AT.xml |  1 +
 data/profiles/CERT_TS_01_04_BO_AA.xml |  9 +++++++--
 data/profiles/CERT_TS_01_04_BO_AT.xml |  1 +
 data/profiles/CERT_TS_02_01_BO_AT.xml |  2 +-
 data/profiles/CERT_TS_02_02_BO_AA.xml | 11 ++++++++---
 data/profiles/CERT_TS_02_02_BO_AT.xml |  2 +-
 data/profiles/CERT_TS_03_BO_CA.xml    |  2 +-
 data/profiles/CERT_TS_A_AA.xml        |  9 +++++++--
 data/profiles/CERT_TS_A_AT.xml        |  5 +++++
 data/profiles/CERT_TS_A_EA.xml        |  9 +++++++--
 data/profiles/CERT_TS_B_AA.xml        |  9 +++++++--
 data/profiles/CERT_TS_C_AA.xml        |  9 +++++++--
 data/profiles/CERT_TS_D_AA.xml        |  9 +++++++--
 data/profiles/CERT_TS_E0_AA.xml       |  9 +++++++--
 data/profiles/CERT_TS_E1_AA.xml       |  9 +++++++--
 data/profiles/CERT_TS_E_AA.xml        |  9 +++++++--
 18 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/data/profiles/CERT_TEST_ROOT.xml b/data/profiles/CERT_TEST_ROOT.xml
index 3827eb911..65ba05fa4 100644
--- a/data/profiles/CERT_TEST_ROOT.xml
+++ b/data/profiles/CERT_TEST_ROOT.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_03_BO_AA.xml b/data/profiles/CERT_TS_01_03_BO_AA.xml
index e288cecb3..227654b6f 100644
--- a/data/profiles/CERT_TS_01_03_BO_AA.xml
+++ b/data/profiles/CERT_TS_01_03_BO_AA.xml
@@ -15,8 +15,8 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_03_BO_AT.xml b/data/profiles/CERT_TS_01_03_BO_AT.xml
index 61c12b270..3a26df018 100644
--- a/data/profiles/CERT_TS_01_03_BO_AT.xml
+++ b/data/profiles/CERT_TS_01_03_BO_AT.xml
@@ -1,3 +1,4 @@
+<!-- valid AT certificate signed with AA cert with version 3 -->
 <certificate name="CERT_TS_01_03_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_01_03_BO_AA"/>
diff --git a/data/profiles/CERT_TS_01_04_BO_AA.xml b/data/profiles/CERT_TS_01_04_BO_AA.xml
index 2d30bee71..7c3c65b01 100644
--- a/data/profiles/CERT_TS_01_04_BO_AA.xml
+++ b/data/profiles/CERT_TS_01_04_BO_AA.xml
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_04_BO_AT.xml b/data/profiles/CERT_TS_01_04_BO_AT.xml
index 9325972b7..db8bc484d 100644
--- a/data/profiles/CERT_TS_01_04_BO_AT.xml
+++ b/data/profiles/CERT_TS_01_04_BO_AT.xml
@@ -1,3 +1,4 @@
+<!-- valid AT certificate signed with AA cert with version 1 -->
 <certificate name="CERT_TS_01_04_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_01_04_BO_AA"/>
diff --git a/data/profiles/CERT_TS_02_01_BO_AT.xml b/data/profiles/CERT_TS_02_01_BO_AT.xml
index f7dc8264a..2a1d52377 100644
--- a/data/profiles/CERT_TS_02_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_01_BO_AT.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate signed by EA cert -->
+<!-- AT certificate signed by EC cert -->
 <certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_EC"/>
diff --git a/data/profiles/CERT_TS_02_02_BO_AA.xml b/data/profiles/CERT_TS_02_02_BO_AA.xml
index 9b1a8535b..26dbe8c99 100644
--- a/data/profiles/CERT_TS_02_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AA.xml
@@ -1,4 +1,4 @@
-<!-- AA certificate signed by EA cert -->
+<!-- AA certificate signed by EC cert -->
 <certificate name="CERT_TS_02_02_BO_AA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_EC"/>
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_02_02_BO_AT.xml b/data/profiles/CERT_TS_02_02_BO_AT.xml
index b263a9c71..8d4a40fc6 100644
--- a/data/profiles/CERT_TS_02_02_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AT.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate signed by AA which is signed by EA -->
+<!-- AT certificate signed by AA which is signed by EC -->
 <certificate name="CERT_TS_02_02_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_02_02_BO_AA"/>
diff --git a/data/profiles/CERT_TS_03_BO_CA.xml b/data/profiles/CERT_TS_03_BO_CA.xml
index d81bc093a..6bd1562ed 100644
--- a/data/profiles/CERT_TS_03_BO_CA.xml
+++ b/data/profiles/CERT_TS_03_BO_CA.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate used to sign AA cert -->
+<!-- valid AT certificate used to sign AA cert -->
 <certificate name="CERT_TS_03_BO_CA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_AA"/>
diff --git a/data/profiles/CERT_TS_A_AA.xml b/data/profiles/CERT_TS_A_AA.xml
index 2f6f722d2..8cabb4c87 100644
--- a/data/profiles/CERT_TS_A_AA.xml
+++ b/data/profiles/CERT_TS_A_AA.xml
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!--CAM--> <!-- CAM -->
-			<aid value="37"/> <!--DENM--> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_AT.xml b/data/profiles/CERT_TS_A_AT.xml
index 617ad57ef..3d95b9540 100644
--- a/data/profiles/CERT_TS_A_AT.xml
+++ b/data/profiles/CERT_TS_A_AT.xml
@@ -16,6 +16,11 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="36">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="37">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
+			<ssp aid="137">&#x01;&#xF8;</ssp> <!-- TLM -->
+			<ssp aid="138">&#x01;&#xE0;</ssp> <!-- RLT -->
+			<ssp aid="139">&#x01;XXX&#xFF;&#xF8;</ssp> <!-- IVI -->
+			<ssp aid="140">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
+			<ssp aid="141">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_EA.xml b/data/profiles/CERT_TS_A_EA.xml
index 196b298e4..8cc6425eb 100644
--- a/data/profiles/CERT_TS_A_EA.xml
+++ b/data/profiles/CERT_TS_A_EA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_B_AA.xml b/data/profiles/CERT_TS_B_AA.xml
index 807d55273..3c639a779 100644
--- a/data/profiles/CERT_TS_B_AA.xml
+++ b/data/profiles/CERT_TS_B_AA.xml
@@ -18,8 +18,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_C_AA.xml b/data/profiles/CERT_TS_C_AA.xml
index 4a2e1987a..00a5b9afc 100644
--- a/data/profiles/CERT_TS_C_AA.xml
+++ b/data/profiles/CERT_TS_C_AA.xml
@@ -17,8 +17,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_D_AA.xml b/data/profiles/CERT_TS_D_AA.xml
index baf62ceb9..bd4f0fc00 100644
--- a/data/profiles/CERT_TS_D_AA.xml
+++ b/data/profiles/CERT_TS_D_AA.xml
@@ -17,8 +17,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E0_AA.xml b/data/profiles/CERT_TS_E0_AA.xml
index 2849a9cbb..37625c06c 100644
--- a/data/profiles/CERT_TS_E0_AA.xml
+++ b/data/profiles/CERT_TS_E0_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E1_AA.xml b/data/profiles/CERT_TS_E1_AA.xml
index fc0f368de..63a51c947 100644
--- a/data/profiles/CERT_TS_E1_AA.xml
+++ b/data/profiles/CERT_TS_E1_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E_AA.xml b/data/profiles/CERT_TS_E_AA.xml
index a339b1927..b926a3edc 100644
--- a/data/profiles/CERT_TS_E_AA.xml
+++ b/data/profiles/CERT_TS_E_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
-- 
GitLab