From 147013280292018083a57a7469873134435837df Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 7 Jun 2024 12:59:43 +0100 Subject: [PATCH 01/43] Initial exmaples and schema --- 104000/examples/01_registration_request.xml | 12 + 104000/examples/01_registration_response.xml | 22 ++ .../examples/02_xn_cert_enrolment_request.xml | 11 + .../02_xn_cert_enrolment_response.xml | 15 ++ 104000/examples/03_configuration_request.xml | 8 + 104000/examples/03_configuration_response.xml | 22 ++ 104000/schema/ts_104000..xsd | 215 ++++++++++++++++++ 7 files changed, 305 insertions(+) create mode 100644 104000/examples/01_registration_request.xml create mode 100644 104000/examples/01_registration_response.xml create mode 100644 104000/examples/02_xn_cert_enrolment_request.xml create mode 100644 104000/examples/02_xn_cert_enrolment_response.xml create mode 100644 104000/examples/03_configuration_request.xml create mode 100644 104000/examples/03_configuration_response.xml create mode 100644 104000/schema/ts_104000..xsd diff --git a/104000/examples/01_registration_request.xml b/104000/examples/01_registration_request.xml new file mode 100644 index 0000000..d032293 --- /dev/null +++ b/104000/examples/01_registration_request.xml @@ -0,0 +1,12 @@ + + ADMF + ELI + 2024-06-07T08:43:17.000000Z + v1.1.1 + 1664ca15-12ea-4f1f-8580-abf5885ae40a + + CMP + + CC-POI + 66b4614d-59e3-4c27-b5d6-a41b3c2e73c6 + diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml new file mode 100644 index 0000000..41aa0dd --- /dev/null +++ b/104000/examples/01_registration_response.xml @@ -0,0 +1,22 @@ + + ADMF + ELI + 2024-06-07T08:43:17.000000Z + v1.1.1 + 1664ca15-12ea-4f1f-8580-abf5885ae40a + ELID_1234 + + + X0-client + + + + + + X0-server + + + + + + diff --git a/104000/examples/02_xn_cert_enrolment_request.xml b/104000/examples/02_xn_cert_enrolment_request.xml new file mode 100644 index 0000000..7f8299f --- /dev/null +++ b/104000/examples/02_xn_cert_enrolment_request.xml @@ -0,0 +1,11 @@ + + ADMF + ELI_1234 + 2024-06-07T11:08:07.000000Z + v1.1.1 + be165469-1024-4551-baab-84932e92abfb + + X0-client + X0-server + + diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml new file mode 100644 index 0000000..7ce30d7 --- /dev/null +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -0,0 +1,15 @@ + + ADMF + ELI_1234 + 2024-06-07T11:08:07.000000Z + v1.1.1 + be165469-1024-4551-baab-84932e92abfb + + + X1-client + + + + + + diff --git a/104000/examples/03_configuration_request.xml b/104000/examples/03_configuration_request.xml new file mode 100644 index 0000000..fc59a0a --- /dev/null +++ b/104000/examples/03_configuration_request.xml @@ -0,0 +1,8 @@ + + ADMF + ELI_1234 + 2024-06-07T11:54:04.000000Z + v1.1.1 + c4556686-90fd-4c6f-ab1b-721d72b954fc + https://eli.example.com/notification/ + diff --git a/104000/examples/03_configuration_response.xml b/104000/examples/03_configuration_response.xml new file mode 100644 index 0000000..3108948 --- /dev/null +++ b/104000/examples/03_configuration_response.xml @@ -0,0 +1,22 @@ + + ADMF + ELI_1234 + 2024-06-07T11:54:04.000000Z + v1.1.1 + c4556686-90fd-4c6f-ab1b-721d72b954fc + + + ETSI + X0 + true + + + ADMF + + https://admf.example.com/x1 + + + + + + diff --git a/104000/schema/ts_104000..xsd b/104000/schema/ts_104000..xsd new file mode 100644 index 0000000..6e77660 --- /dev/null +++ b/104000/schema/ts_104000..xsd @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 19ebb595526b737a715d7a70fe326d56dab79cf0 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 27 Aug 2024 13:32:53 +0000 Subject: [PATCH 02/43] Replace ts_104000..xsd --- 104000/schema/ts_104000..xsd | 129 +++++++++++++++++++++++++++++++++-- 1 file changed, 122 insertions(+), 7 deletions(-) diff --git a/104000/schema/ts_104000..xsd b/104000/schema/ts_104000..xsd index 6e77660..1701034 100644 --- a/104000/schema/ts_104000..xsd +++ b/104000/schema/ts_104000..xsd @@ -13,6 +13,9 @@ + + + @@ -22,6 +25,10 @@ + + + + @@ -38,6 +45,19 @@ + + + + + + + + + + + + + @@ -71,7 +91,7 @@ - + @@ -87,6 +107,9 @@ + + + @@ -119,7 +142,7 @@ - + @@ -147,7 +170,7 @@ - + @@ -166,6 +189,7 @@ + @@ -177,17 +201,49 @@ + - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 8a79ad2838b35e7cd974908bc33f66251e8d7512 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 27 Aug 2024 15:40:53 +0100 Subject: [PATCH 03/43] Fixing filename --- 104000/schema/{ts_104000..xsd => ts_10400.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 104000/schema/{ts_104000..xsd => ts_10400.xsd} (100%) diff --git a/104000/schema/ts_104000..xsd b/104000/schema/ts_10400.xsd similarity index 100% rename from 104000/schema/ts_104000..xsd rename to 104000/schema/ts_10400.xsd -- GitLab From c26aca87f37ff2ba55e7f2e5b9f9586bcd9709c6 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 27 Aug 2024 16:35:19 +0100 Subject: [PATCH 04/43] Actually fixing filename --- 104000/schema/{ts_10400.xsd => ts_104000.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 104000/schema/{ts_10400.xsd => ts_104000.xsd} (100%) diff --git a/104000/schema/ts_10400.xsd b/104000/schema/ts_104000.xsd similarity index 100% rename from 104000/schema/ts_10400.xsd rename to 104000/schema/ts_104000.xsd -- GitLab From 259adf9cbc4a083beb0c902b33c0257c072e6b29 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Wed, 28 Aug 2024 15:16:12 +0000 Subject: [PATCH 05/43] Replace ts_104000.xsd --- 104000/schema/ts_104000.xsd | 72 +++++-------------------------------- 1 file changed, 9 insertions(+), 63 deletions(-) diff --git a/104000/schema/ts_104000.xsd b/104000/schema/ts_104000.xsd index 1701034..0170384 100644 --- a/104000/schema/ts_104000.xsd +++ b/104000/schema/ts_104000.xsd @@ -13,9 +13,7 @@ - - @@ -25,10 +23,7 @@ - - - @@ -45,7 +40,6 @@ - @@ -57,7 +51,6 @@ - @@ -75,7 +68,7 @@ - + @@ -83,33 +76,22 @@ - + - + - - - - - - - - - - - - + @@ -189,7 +171,6 @@ - @@ -201,23 +182,15 @@ - - - - - - - + - - @@ -226,14 +199,12 @@ - - @@ -241,36 +212,15 @@ - - - - - + - + - - - + @@ -280,8 +230,7 @@ - - + @@ -298,7 +247,6 @@ - @@ -311,7 +259,6 @@ - @@ -322,7 +269,6 @@ - -- GitLab From 3828eab38c7b25409fb6390ad8e1bc37a8d02f56 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 29 Aug 2024 14:04:09 +0100 Subject: [PATCH 06/43] Turning on testing, fixing schema and examples --- 104000/examples/01_registration_request.xml | 1 + 104000/examples/01_registration_response.xml | 26 ++++++++++++++----- .../examples/02_xn_cert_enrolment_request.xml | 1 + .../02_xn_cert_enrolment_response.xml | 21 +++++++++++++-- 104000/examples/03_configuration_request.xml | 1 + 104000/examples/03_configuration_response.xml | 10 +------ .../schema/{ts_104000.xsd => TS_104_000.xsd} | 1 - testing/xsd_compile_targets.json | 11 +++++++- 8 files changed, 52 insertions(+), 20 deletions(-) rename 104000/schema/{ts_104000.xsd => TS_104_000.xsd} (99%) diff --git a/104000/examples/01_registration_request.xml b/104000/examples/01_registration_request.xml index d032293..096247e 100644 --- a/104000/examples/01_registration_request.xml +++ b/104000/examples/01_registration_request.xml @@ -4,6 +4,7 @@ 2024-06-07T08:43:17.000000Z v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a + RegistrationRequest CMP diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index 41aa0dd..c21655b 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -4,18 +4,30 @@ 2024-06-07T08:43:17.000000Z v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a + RegistrationResponse ELID_1234 + CMP X0-client - - - - - X0-server - - + + + server_name + certificate_authority + http://example.com + + + key_name + certificate_name + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + + diff --git a/104000/examples/02_xn_cert_enrolment_request.xml b/104000/examples/02_xn_cert_enrolment_request.xml index 7f8299f..35eceed 100644 --- a/104000/examples/02_xn_cert_enrolment_request.xml +++ b/104000/examples/02_xn_cert_enrolment_request.xml @@ -4,6 +4,7 @@ 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb + XnCertEnrolmentRequest X0-client X0-server diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 7ce30d7..813c59b 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -4,11 +4,28 @@ 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb + XnCertEnrolmentResponse - X1-client + X0-client - + + + server_name + certificate_authority + http://example.com + + + key_name + certificate_name + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + + diff --git a/104000/examples/03_configuration_request.xml b/104000/examples/03_configuration_request.xml index fc59a0a..95bfbf4 100644 --- a/104000/examples/03_configuration_request.xml +++ b/104000/examples/03_configuration_request.xml @@ -4,5 +4,6 @@ 2024-06-07T11:54:04.000000Z v1.1.1 c4556686-90fd-4c6f-ab1b-721d72b954fc + ConfigurationRequest https://eli.example.com/notification/ diff --git a/104000/examples/03_configuration_response.xml b/104000/examples/03_configuration_response.xml index 3108948..6d56167 100644 --- a/104000/examples/03_configuration_response.xml +++ b/104000/examples/03_configuration_response.xml @@ -4,19 +4,11 @@ 2024-06-07T11:54:04.000000Z v1.1.1 c4556686-90fd-4c6f-ab1b-721d72b954fc + ConfigurationResponse ETSI X0 - true - - - ADMF - - https://admf.example.com/x1 - - - diff --git a/104000/schema/ts_104000.xsd b/104000/schema/TS_104_000.xsd similarity index 99% rename from 104000/schema/ts_104000.xsd rename to 104000/schema/TS_104_000.xsd index 0170384..2f4d4c4 100644 --- a/104000/schema/ts_104000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -225,7 +225,6 @@ - diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index 8aa1774..a165798 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -71,5 +71,14 @@ "exampleFiles" : [ "103707/examples" ] - } + }, + { + "coreSchema" : "104000/schema/TS_104_000.xsd", + "supportingSchemas" : [ + "103280/TS_103_280.xsd" + ], + "exampleFiles" : [ + "104000/examples" + ] + } ] -- GitLab From fbf056818b1717feece9e6e462d54348db35360c Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 29 Aug 2024 14:09:53 +0000 Subject: [PATCH 07/43] Apply 1 suggestion(s) to 1 file(s) --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 2f4d4c4..053618c 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -250,7 +250,7 @@ - + -- GitLab From de7c13f0d09d42b1e4bfe210798b3651ea47d9e7 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:32:18 +0000 Subject: [PATCH 08/43] Update 02_xn_cert_enrolment_response.xml --- 104000/examples/02_xn_cert_enrolment_response.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 813c59b..5594ec3 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -18,7 +18,7 @@ key_name certificate_name - rsa2048 + rsa2048 key_identifier password subject -- GitLab From a8d4d81f33a447582f84706ce9a2900bd5609dc6 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:35:32 +0000 Subject: [PATCH 09/43] Update TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 053618c..9b2cdca 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -251,11 +251,11 @@ - - - - - + + + + + -- GitLab From 5c795a4b1e154a4fbde357aad1269e374060f640 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:37:07 +0000 Subject: [PATCH 10/43] Update 02_xn_cert_enrolment_response.xml --- 104000/examples/02_xn_cert_enrolment_response.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 5594ec3..114376f 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -19,11 +19,11 @@ key_name certificate_name rsa2048 - key_identifier - password - subject - subject_alt_name - 1 + key_identifier + password + subject + subject_alt_name + 1 -- GitLab From a5dc4fac1f4478907b9873253b32b948f5e8ee98 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:40:45 +0000 Subject: [PATCH 11/43] Update 01_registration_response.xml --- 104000/examples/01_registration_response.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index c21655b..b34521c 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -20,12 +20,12 @@ key_name certificate_name - rsa2048 - key_identifier - password - subject - subject_alt_name - 1 + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 -- GitLab From 3efdf02db42df7333cd10f9144c24894590efbf5 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:44:19 +0000 Subject: [PATCH 12/43] Update 01_registration_response.xml --- 104000/examples/01_registration_response.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index b34521c..75ef8ab 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -21,11 +21,11 @@ key_name certificate_name rsa2048 - key_identifier - password - subject - subject_alt_name - 1 + key_identifier + password + subject + subject_alt_name + 1 -- GitLab From 4aeea0b579a574cfec28fbd420abc6aff48c6198 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:47:29 +0000 Subject: [PATCH 13/43] Update 02_xn_cert_enrolment_response.xml --- 104000/examples/02_xn_cert_enrolment_response.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 114376f..d8d88d3 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -20,10 +20,10 @@ certificate_name rsa2048 key_identifier - password - subject - subject_alt_name - 1 + password + subject + subject_alt_name + 1 -- GitLab From 2697fec3dcc1824e6cd531288aab455b427ee1dd Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 14:57:41 +0000 Subject: [PATCH 14/43] Update TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 9b2cdca..5b7531b 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -260,8 +260,8 @@ - - + + -- GitLab From b9a5a0bab7d66e8ed67cbc92fe3c00ceee87f64c Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 15:03:30 +0000 Subject: [PATCH 15/43] Update 02_xn_cert_enrolment_response.xml --- 104000/examples/02_xn_cert_enrolment_response.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index d8d88d3..0da9128 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -19,7 +19,7 @@ key_name certificate_name rsa2048 - key_identifier + key_identifier password subject subject_alt_name -- GitLab From ebe7c2a426e1fafc081e8a6566c16ae601fb52f9 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Thu, 29 Aug 2024 15:54:59 +0000 Subject: [PATCH 16/43] Update TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 5b7531b..fac5036 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -243,7 +243,7 @@ - + -- GitLab From 7951d93bc5988b83f3b4f183fc7bad26449e2818 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Mon, 9 Sep 2024 15:10:05 +0000 Subject: [PATCH 17/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 142 ++++++++++++++--------------------- 1 file changed, 58 insertions(+), 84 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index fac5036..f080097 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -1,8 +1,12 @@ + + @@ -13,7 +17,6 @@ - @@ -23,7 +26,6 @@ - @@ -40,17 +42,6 @@ - - - - - - - - - - - @@ -68,15 +59,15 @@ - - + + - + @@ -91,58 +82,42 @@ - - + - + - + + - + - + - - - - - - - - - - - - + - + - + + - - - - - - - + @@ -166,52 +141,49 @@ - + - - - - - - - - - - + + + + + + + + + - - - - - + + + - + - - - - - + + + + + - - - + + + - - + + @@ -225,31 +197,33 @@ + + + + + + - - + - - + + - - + - + - - @@ -259,15 +233,15 @@ - - - + + + - - + + -- GitLab From 09e407c3a9f8aaa9372383d390d943c2cf2531f5 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Mon, 9 Sep 2024 21:16:35 +0000 Subject: [PATCH 18/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index f080097..856c2c2 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -93,14 +93,14 @@ - + - + - + @@ -109,7 +109,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -222,7 +222,7 @@ - + -- GitLab From 7361098627f4a2a2f97b3d47566896976dc00652 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Mon, 9 Sep 2024 21:19:39 +0000 Subject: [PATCH 20/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 856c2c2..f347bc5 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -100,7 +100,7 @@ - + -- GitLab From 75cefff02ab9b2b31aa859e80f1e84d95169ed80 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Mon, 9 Sep 2024 21:51:10 +0000 Subject: [PATCH 21/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index f347bc5..73cf321 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -152,7 +152,7 @@ - + -- GitLab From 117e27b37fbd2966c937e18b688476b06200bc84 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 07:02:47 +0000 Subject: [PATCH 22/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 73cf321..72b086e 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -157,11 +157,9 @@ - - - - - + + + -- GitLab From 3bc620ef90150f6d62131da3b447f8cd0e67410a Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 07:12:14 +0000 Subject: [PATCH 23/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 72b086e..8958609 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -147,14 +147,12 @@ - - - - - - - - + + + + + + -- GitLab From 4c0d40930ed7bfb1f52b141bc6c0cfa83ce12124 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 07:23:59 +0000 Subject: [PATCH 24/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 8958609..1d60079 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -109,7 +109,7 @@ - + -- GitLab From 47133e23611ad1ee3147a8eaf4fe90aed08c14ad Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 07:36:21 +0000 Subject: [PATCH 25/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 1d60079..a908234 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -93,7 +93,7 @@ - + @@ -103,13 +103,12 @@ - - + -- GitLab From 50354ce5c468ec14ba71dc4b3a52f3ff31a10b87 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 09:01:44 +0000 Subject: [PATCH 28/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index a908234..3458578 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -1,12 +1,8 @@ - - @@ -145,12 +141,9 @@ - + - - - -- GitLab From ae69d585feeb30954cce57921a5d72e0df80eafa Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 12:42:04 +0000 Subject: [PATCH 29/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 3458578..21c9c9d 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -137,20 +137,29 @@ + - + - + - + - + + + + + + + + + -- GitLab From 6abd891795756fe8850cf2d142bfbd032a15a555 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 10 Sep 2024 12:43:18 +0000 Subject: [PATCH 30/43] Replace TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 21c9c9d..d129e99 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -136,7 +136,6 @@ - -- GitLab From a89343c5f9cc45dcd51cabf363c4de0204ded31e Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 10 Sep 2024 13:44:19 +0100 Subject: [PATCH 31/43] Fixing inheritence --- 104000/examples/01_registration_request.xml | 7 +++---- 104000/examples/03_configuration_response.xml | 9 ++++++--- 104000/schema/TS_104_000.xsd | 12 ++++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/104000/examples/01_registration_request.xml b/104000/examples/01_registration_request.xml index 096247e..2c7d5db 100644 --- a/104000/examples/01_registration_request.xml +++ b/104000/examples/01_registration_request.xml @@ -4,10 +4,9 @@ 2024-06-07T08:43:17.000000Z v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a - RegistrationRequest - CMP + CMP - CC-POI - 66b4614d-59e3-4c27-b5d6-a41b3c2e73c6 + bfbd009d-1cf4-4bde-8074-886686a41ab3 + 66b4614d-59e3-4c27-b5d6-a41b3c2e73c6 diff --git a/104000/examples/03_configuration_response.xml b/104000/examples/03_configuration_response.xml index 6d56167..8ab289a 100644 --- a/104000/examples/03_configuration_response.xml +++ b/104000/examples/03_configuration_response.xml @@ -4,11 +4,14 @@ 2024-06-07T11:54:04.000000Z v1.1.1 c4556686-90fd-4c6f-ab1b-721d72b954fc - ConfigurationResponse - ETSI - X0 + X0 + + a76dfe34-5c57-43f6-94b4-50201953f2da + PKCS12BASE64 + ...value... + diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 3458578..631610e 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -143,13 +143,17 @@ - + - - - + + + + + + + -- GitLab From dcc7e4a53d3f073b09ac3eb3b30b2360d84cf605 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 10 Sep 2024 14:49:16 +0100 Subject: [PATCH 32/43] Fixing examples and tidying up schema --- 104000/examples/01_registration_request.xml | 4 +- 104000/examples/01_registration_response.xml | 38 +++++++++--------- .../examples/02_xn_cert_enrolment_request.xml | 13 +++--- .../02_xn_cert_enrolment_response.xml | 39 +++++++++--------- 104000/examples/03_configuration_request.xml | 1 - 104000/examples/03_configuration_response.xml | 6 +-- 104000/schema/TS_104_000.xsd | 40 +++++++++++++------ 7 files changed, 81 insertions(+), 60 deletions(-) diff --git a/104000/examples/01_registration_request.xml b/104000/examples/01_registration_request.xml index 2c7d5db..986ac11 100644 --- a/104000/examples/01_registration_request.xml +++ b/104000/examples/01_registration_request.xml @@ -7,6 +7,6 @@ CMP - bfbd009d-1cf4-4bde-8074-886686a41ab3 - 66b4614d-59e3-4c27-b5d6-a41b3c2e73c6 + bfbd009d-1cf4-4bde-8074-886686a41ab3 + 66b4614d-59e3-4c27-b5d6-a41b3c2e73c6 diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index 75ef8ab..06d800d 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -4,31 +4,33 @@ 2024-06-07T08:43:17.000000Z v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a - RegistrationResponse ELID_1234 - CMP - - - X0-client - - - - server_name + + LI_X1 + + SDO + X1 + + + + + + server_name certificate_authority http://example.com - - - key_name - certificate_name + + + + rsa2048 key_identifier password subject subject_alt_name 1 - - - - - + + + + + diff --git a/104000/examples/02_xn_cert_enrolment_request.xml b/104000/examples/02_xn_cert_enrolment_request.xml index 35eceed..26fb483 100644 --- a/104000/examples/02_xn_cert_enrolment_request.xml +++ b/104000/examples/02_xn_cert_enrolment_request.xml @@ -1,12 +1,13 @@ - + ADMF ELI_1234 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb - XnCertEnrolmentRequest - - X0-client - X0-server - + + + ETSI + X1 + + diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 0da9128..20c3585 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -1,32 +1,35 @@ - + ADMF ELI_1234 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb - XnCertEnrolmentResponse - - - X0-client - - - - server_name + + LI_X1 + + SDO + X1 + + + + + + server_name certificate_authority http://example.com - - - key_name - certificate_name + + + + rsa2048 key_identifier password subject subject_alt_name 1 - - - - - + + + + + diff --git a/104000/examples/03_configuration_request.xml b/104000/examples/03_configuration_request.xml index 95bfbf4..fc59a0a 100644 --- a/104000/examples/03_configuration_request.xml +++ b/104000/examples/03_configuration_request.xml @@ -4,6 +4,5 @@ 2024-06-07T11:54:04.000000Z v1.1.1 c4556686-90fd-4c6f-ab1b-721d72b954fc - ConfigurationRequest https://eli.example.com/notification/ diff --git a/104000/examples/03_configuration_response.xml b/104000/examples/03_configuration_response.xml index 8ab289a..16b66fb 100644 --- a/104000/examples/03_configuration_response.xml +++ b/104000/examples/03_configuration_response.xml @@ -6,11 +6,11 @@ c4556686-90fd-4c6f-ab1b-721d72b954fc - X0 + X1 - a76dfe34-5c57-43f6-94b4-50201953f2da + be0b4911-e55c-40a2-aece-04802d5e25fc PKCS12BASE64 - ...value... + value diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index b528b96..b399d01 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -55,8 +55,8 @@ - - + + @@ -88,15 +88,20 @@ - - + - + + + + + + + @@ -104,7 +109,6 @@ - @@ -112,13 +116,15 @@ - + + + - - + + @@ -155,7 +161,7 @@ - + @@ -208,11 +214,16 @@ - - + + + + + + + @@ -220,6 +231,11 @@ + + + + + -- GitLab From 20cc278de87abc962b5032cc9b18111d6f89c541 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 11 Sep 2024 15:23:59 +0100 Subject: [PATCH 33/43] Fixing multiplicity of enrolment details --- 104000/examples/01_registration_response.xml | 58 ++++++++++--------- .../02_xn_cert_enrolment_response.xml | 58 ++++++++++--------- 104000/schema/TS_104_000.xsd | 15 +++-- 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index 06d800d..f997b40 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -5,32 +5,34 @@ v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a ELID_1234 - - LI_X1 - - SDO - X1 - - - - - - server_name - certificate_authority - http://example.com - - - - - rsa2048 - key_identifier - password - subject - subject_alt_name - 1 - - - - - + + + LI_X1 + + SDO + X1 + + + + + + server_name + certificate_authority + http://example.com + + + + + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + + + + + + diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index 20c3585..a2643f4 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -4,32 +4,34 @@ 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb - - LI_X1 - - SDO - X1 - - - - - - server_name - certificate_authority - http://example.com - - - - - rsa2048 - key_identifier - password - subject - subject_alt_name - 1 - - - - - + + + LI_X1 + + SDO + X1 + + + + + + server_name + certificate_authority + http://example.com + + + + + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + + + + + + diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index b399d01..adeccf9 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -78,7 +78,7 @@ - + @@ -109,12 +109,17 @@ - + + + + + + @@ -215,7 +220,7 @@ - + @@ -230,7 +235,7 @@ - + @@ -238,7 +243,7 @@ - + -- GitLab From ef273f264c84172efe89ddc12cc85155022bfb0b Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 11 Sep 2024 15:58:44 +0100 Subject: [PATCH 34/43] Making keyIdentifier optional - properly this time --- 104000/schema/TS_104_000.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index adeccf9..a7dc4bd 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -243,7 +243,7 @@ - + -- GitLab From 20f559e2a7225a3a97c6be8d4efc906d0d2c8892 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 11 Sep 2024 16:02:44 +0100 Subject: [PATCH 35/43] Correcting list multiplicity. Again. --- 104000/examples/01_registration_response.xml | 18 ++++++++---------- .../examples/02_xn_cert_enrolment_response.xml | 18 ++++++++---------- 104000/schema/TS_104_000.xsd | 7 +------ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index f997b40..3708035 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -21,16 +21,14 @@ http://example.com - - - rsa2048 - key_identifier - password - subject - subject_alt_name - 1 - - + + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index a2643f4..f2f5f43 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -20,16 +20,14 @@ http://example.com - - - rsa2048 - key_identifier - password - subject - subject_alt_name - 1 - - + + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index a7dc4bd..8a81af7 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -220,7 +220,7 @@ - + @@ -235,11 +235,6 @@ - - - - - -- GitLab From 35ad37c8fa0bf653fdff7baa6a8e2fd5f4871eac Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Sep 2024 08:28:37 +0100 Subject: [PATCH 36/43] Changing to enrolment --- .../examples/02_xn_cert_enrolment_request.xml | 22 +++++--- 104000/schema/TS_104_000.xsd | 52 ++++++++++--------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/104000/examples/02_xn_cert_enrolment_request.xml b/104000/examples/02_xn_cert_enrolment_request.xml index 26fb483..8c2b4ef 100644 --- a/104000/examples/02_xn_cert_enrolment_request.xml +++ b/104000/examples/02_xn_cert_enrolment_request.xml @@ -4,10 +4,20 @@ 2024-06-07T11:08:07.000000Z v1.1.1 be165469-1024-4551-baab-84932e92abfb - - - ETSI - X1 - - + + + LI_X1 + + ETSI + X1-client + + + + LI_T2 + + ETSI + X1-server + + + diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 8a81af7..33c5d43 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -1,7 +1,5 @@ - + @@ -71,7 +69,7 @@ - + @@ -88,14 +86,20 @@ - + - + + + + + + - + + @@ -104,6 +108,9 @@ + + + @@ -116,12 +123,12 @@ - + - + @@ -129,11 +136,10 @@ - - + @@ -159,7 +165,7 @@ - + @@ -192,15 +198,15 @@ - - + + - + @@ -210,12 +216,12 @@ - - - - + + + + - + @@ -255,8 +261,4 @@ - - - - - + \ No newline at end of file -- GitLab From c18af798827d8cfbd766c0a9397484f9f0bbbc35 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Sep 2024 08:36:11 +0100 Subject: [PATCH 37/43] Updating examples to match tables for enrolment --- .../examples/02_xn_cert_enrolment_request.xml | 4 +-- .../02_xn_cert_enrolment_response.xml | 30 +++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/104000/examples/02_xn_cert_enrolment_request.xml b/104000/examples/02_xn_cert_enrolment_request.xml index 8c2b4ef..be34814 100644 --- a/104000/examples/02_xn_cert_enrolment_request.xml +++ b/104000/examples/02_xn_cert_enrolment_request.xml @@ -8,14 +8,14 @@ LI_X1 - ETSI + ETSI-TC-LI X1-client LI_T2 - ETSI + ETSI-TC-LI X1-server diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index f2f5f43..cfecd43 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -8,8 +8,34 @@ LI_X1 - SDO - X1 + ETSI-TC-LI + X1-client + + + + + + server_name + certificate_authority + http://example.com + + + + rsa2048 + key_identifier + password + subject + subject_alt_name + 1 + + + + + + LI_T2 + + ETSI-TC-LI + X1-server -- GitLab From 4d44ae4d1516470f7d5b3eaf88ae78013c5334b2 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 17 Sep 2024 08:35:20 +0000 Subject: [PATCH 38/43] Upload New File --- 104000/examples/04_notification_request.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 104000/examples/04_notification_request.xml diff --git a/104000/examples/04_notification_request.xml b/104000/examples/04_notification_request.xml new file mode 100644 index 0000000..c2cfbe0 --- /dev/null +++ b/104000/examples/04_notification_request.xml @@ -0,0 +1,7 @@ + + ADMF + ELI_1234 + 2024-06-07T11:54:04.000000Z + v1.1.1 + c4556686-90fd-4c6f-ab1b-721d72b954fc + -- GitLab From f95c782a8c66841e6f5da2210151c1fcb049ca00 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 17 Sep 2024 08:36:09 +0000 Subject: [PATCH 39/43] Upload New File --- 104000/examples/04_notification_response.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 104000/examples/04_notification_response.xml diff --git a/104000/examples/04_notification_response.xml b/104000/examples/04_notification_response.xml new file mode 100644 index 0000000..05182a5 --- /dev/null +++ b/104000/examples/04_notification_response.xml @@ -0,0 +1,8 @@ + + ADMF + ELI_1234 + 2024-06-07T11:54:04.000000Z + v1.1.1 + c4556686-90fd-4c6f-ab1b-721d72b954fc + OK + -- GitLab From 89ffe228791cce67467b53d29e2fd666b0b6f0c8 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Sep 2024 09:53:16 +0100 Subject: [PATCH 40/43] Changing eliIdentifier in registration --- 104000/examples/01_registration_request.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/examples/01_registration_request.xml b/104000/examples/01_registration_request.xml index 986ac11..d348c3f 100644 --- a/104000/examples/01_registration_request.xml +++ b/104000/examples/01_registration_request.xml @@ -1,6 +1,6 @@ ADMF - ELI + X0ID 2024-06-07T08:43:17.000000Z v1.1.1 1664ca15-12ea-4f1f-8580-abf5885ae40a -- GitLab From cffb0c68a1987d3329ad645f4118e6ebfe03fdc8 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Sep 2024 10:22:48 +0100 Subject: [PATCH 41/43] Fixing case of OK --- 104000/examples/04_notification_response.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/104000/examples/04_notification_response.xml b/104000/examples/04_notification_response.xml index 05182a5..d66d0da 100644 --- a/104000/examples/04_notification_response.xml +++ b/104000/examples/04_notification_response.xml @@ -4,5 +4,5 @@ 2024-06-07T11:54:04.000000Z v1.1.1 c4556686-90fd-4c6f-ab1b-721d72b954fc - OK + OK -- GitLab From 8baca4c5c38fc43c0741c19f6c4385a123de0516 Mon Sep 17 00:00:00 2001 From: Biagio Maione Date: Tue, 24 Sep 2024 09:46:01 +0000 Subject: [PATCH 42/43] Update TS_104_000.xsd --- 104000/schema/TS_104_000.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index 33c5d43..bff2e22 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -99,7 +99,7 @@ - + @@ -261,4 +261,4 @@ - \ No newline at end of file + -- GitLab From 7352b7709a3f595cabbfa866c1619783f8c7c7d4 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 25 Sep 2024 12:18:02 +0100 Subject: [PATCH 43/43] Updating algo definition and examples --- 104000/examples/01_registration_response.xml | 5 ++++- .../examples/02_xn_cert_enrolment_response.xml | 10 ++++++++-- 104000/schema/TS_104_000.xsd | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/104000/examples/01_registration_response.xml b/104000/examples/01_registration_response.xml index 3708035..bf303c5 100644 --- a/104000/examples/01_registration_response.xml +++ b/104000/examples/01_registration_response.xml @@ -22,7 +22,10 @@ - rsa2048 + + 1.2.840.113549.1.1.1 + 2048 + key_identifier password subject diff --git a/104000/examples/02_xn_cert_enrolment_response.xml b/104000/examples/02_xn_cert_enrolment_response.xml index cfecd43..68b00b6 100644 --- a/104000/examples/02_xn_cert_enrolment_response.xml +++ b/104000/examples/02_xn_cert_enrolment_response.xml @@ -21,7 +21,10 @@ - rsa2048 + + 1.2.840.113549.1.1.1 + 2048 + key_identifier password subject @@ -47,7 +50,10 @@ - rsa2048 + + 1.2.840.10045.2.1 + 1.2.840.10045.3.1.7 + key_identifier password subject diff --git a/104000/schema/TS_104_000.xsd b/104000/schema/TS_104_000.xsd index bff2e22..a485947 100644 --- a/104000/schema/TS_104_000.xsd +++ b/104000/schema/TS_104_000.xsd @@ -251,14 +251,16 @@ - - - - - - - - + + + + + + + + + + -- GitLab