From 1671e5bb14ab7ac0ec083f73f58c063078ea412a Mon Sep 17 00:00:00 2001
From: filatov <filatov@5a941883-869f-0410-b6e7-a816b635d326>
Date: Wed, 25 Nov 2015 15:50:52 +0000
Subject: [PATCH] fix certificate profile bugs to be conformed to the published
 version of spec

---
 data/profiles/CERT_TS_02_01_BO_AT.xml         |  2 +-
 data/profiles/CERT_TS_02_02_BO_AA.xml         |  2 +-
 ...3_01_BO_AA.xml => CERT_TS_02_03_BO_AT.xml} |  6 ++--
 data/profiles/CERT_TS_02_04_BO_AA.xml         | 29 +++++++++++++++++++
 data/profiles/CERT_TS_02_04_BO_AT.xml         | 29 +++++++++++++++++++
 data/profiles/CERT_TS_03_01_BO_AT.xml         |  2 +-
 data/profiles/CERT_TS_03_02_BO_AA.xml         |  2 +-
 ...S_03_02_BO_CA.xml => CERT_TS_03_BO_CA.xml} |  2 +-
 8 files changed, 66 insertions(+), 8 deletions(-)
 rename data/profiles/{CERT_TS_03_01_BO_AA.xml => CERT_TS_02_03_BO_AT.xml} (81%)
 create mode 100644 data/profiles/CERT_TS_02_04_BO_AA.xml
 create mode 100644 data/profiles/CERT_TS_02_04_BO_AT.xml
 rename data/profiles/{CERT_TS_03_02_BO_CA.xml => CERT_TS_03_BO_CA.xml} (92%)

diff --git a/data/profiles/CERT_TS_02_01_BO_AT.xml b/data/profiles/CERT_TS_02_01_BO_AT.xml
index 33c5553f..72195447 100644
--- a/data/profiles/CERT_TS_02_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_01_BO_AT.xml
@@ -1,7 +1,7 @@
 <!-- AT certificate signed by EA cert -->
 <certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_EA"/>
+	<signer type="digest" name="CERT_TS_A_EC"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_02_02_BO_AA.xml b/data/profiles/CERT_TS_02_02_BO_AA.xml
index 592b4270..4f17bbd8 100644
--- a/data/profiles/CERT_TS_02_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AA.xml
@@ -1,7 +1,7 @@
 <!-- AA certificate signed by EA cert -->
 <certificate name="CERT_TS_02_02_BO_AA">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_EA"/>
+	<signer type="digest" name="CERT_TS_A_EC"/>
 	<subject type="AA" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_01_BO_AA.xml b/data/profiles/CERT_TS_02_03_BO_AT.xml
similarity index 81%
rename from data/profiles/CERT_TS_03_01_BO_AA.xml
rename to data/profiles/CERT_TS_02_03_BO_AT.xml
index aa1cfa5e..33c5553f 100644
--- a/data/profiles/CERT_TS_03_01_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_03_BO_AT.xml
@@ -1,7 +1,7 @@
-<!-- AT certificate used to sign other AT cert -->
-<certificate name="CERT_TS_03_01_BO_AA">
+<!-- AT certificate signed by EA cert -->
+<certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_AA"/>
+	<signer type="digest" name="CERT_TS_A_EA"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_02_04_BO_AA.xml b/data/profiles/CERT_TS_02_04_BO_AA.xml
new file mode 100644
index 00000000..a5f38df8
--- /dev/null
+++ b/data/profiles/CERT_TS_02_04_BO_AA.xml
@@ -0,0 +1,29 @@
+<!-- AA certificate signed by EA cert -->
+<certificate name="CERT_TS_02_04_BO_AA">
+	<version>2</version>
+	<signer type="digest" name="CERT_TS_A_EA"/>
+	<subject type="AA" name="">
+		<!-- verification_key -->
+		<attribute type="verification_key">
+			<public_key algorythm="ecdsa_nistp256_with_sha256">
+				<ecc_point type="uncompressed"/>
+			</public_key>
+		</attribute>
+		<!-- assurance_level -->
+		<attribute type="assurance_level">
+			<assurance level="4" confidence="0"/>
+		</attribute>
+		<!-- its_aid_list -->
+		<attribute type="its_aid_list">
+			<aid value="36"/> <!-- CAM -->
+			<aid value="37"/> <!-- DENM -->
+		</attribute>
+	</subject>
+	<validity>
+		<restriction type="time" start="2015-01-01" end="2015-04-30"/>
+		<restriction type="region">
+			<none/>
+		</restriction>
+	</validity>
+	<signature algorithm="0"/>
+</certificate>
diff --git a/data/profiles/CERT_TS_02_04_BO_AT.xml b/data/profiles/CERT_TS_02_04_BO_AT.xml
new file mode 100644
index 00000000..7926e4ee
--- /dev/null
+++ b/data/profiles/CERT_TS_02_04_BO_AT.xml
@@ -0,0 +1,29 @@
+<!-- AT certificate signed by AA which is signed by EA -->
+<certificate name="CERT_TS_02_04_BO_AT">
+	<version>2</version>
+	<signer type="digest" name="CERT_TS_02_04_BO_AA"/>
+	<subject type="AT" name="">
+		<!-- verification_key -->
+		<attribute type="verification_key">
+			<public_key algorythm="ecdsa_nistp256_with_sha256">
+				<ecc_point type="uncompressed"/>
+			</public_key>
+		</attribute>
+		<!-- assurance_level -->
+		<attribute type="assurance_level">
+			<assurance level="3"/>
+		</attribute>
+		<!-- its_aid_ssp_list -->
+		<attribute type="its_aid_ssp_list">
+			<ssp aid="36">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
+			<ssp aid="37">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
+		</attribute>
+	</subject>
+	<validity>
+		<restriction type="time" start="2015-01-01" end="2015-04-30"/>
+		<restriction type="region">
+			<none/>
+		</restriction>
+	</validity>
+	<signature algorithm="0"/>
+</certificate>
diff --git a/data/profiles/CERT_TS_03_01_BO_AT.xml b/data/profiles/CERT_TS_03_01_BO_AT.xml
index 3506132b..9dce8f34 100644
--- a/data/profiles/CERT_TS_03_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_03_01_BO_AT.xml
@@ -1,7 +1,7 @@
 <!-- AT certificate signed by other AT certificate -->
 <certificate name="CERT_TS_03_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_03_01_BO_AA"/>
+	<signer type="digest" name="CERT_TS_03_BO_CA"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_02_BO_AA.xml b/data/profiles/CERT_TS_03_02_BO_AA.xml
index 4992c149..67bc328e 100644
--- a/data/profiles/CERT_TS_03_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_03_02_BO_AA.xml
@@ -1,7 +1,7 @@
 <!-- AA certificate signed by AT cert -->
 <certificate name="CERT_TS_03_02_BO_AA">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_03_02_BO_CA"/>
+	<signer type="digest" name="CERT_TS_03_BO_CA"/>
 	<subject type="AA" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_02_BO_CA.xml b/data/profiles/CERT_TS_03_BO_CA.xml
similarity index 92%
rename from data/profiles/CERT_TS_03_02_BO_CA.xml
rename to data/profiles/CERT_TS_03_BO_CA.xml
index 59b8a9a3..97a6ed20 100644
--- a/data/profiles/CERT_TS_03_02_BO_CA.xml
+++ b/data/profiles/CERT_TS_03_BO_CA.xml
@@ -1,5 +1,5 @@
 <!-- AT certificate used to sign AA cert -->
-<certificate name="CERT_TS_03_02_BO_CA">
+<certificate name="CERT_TS_03_BO_CA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_AA"/>
 	<subject type="AT" name="">
-- 
GitLab