From f4b030547f34aaf5c046ea881bfe0e0fd03a1b11 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 14:03:02 +0000 Subject: [PATCH 01/27] Update file translate_spec.py --- utils/translate_spec.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/translate_spec.py b/utils/translate_spec.py index 6ce2f84..cae7da7 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -12,7 +12,12 @@ logging.basicConfig(level=logging.INFO) json_signature_struct = { "properties": {"protected": {"type": "string"}, "signature": {"type": "string"}}, - "required": ["protected", "signature"], + "required": ["protected", "signature"] +} + +json_x590_signature_struct = { + "properties": {"hash_algorithm": {"type": "string"}, "algorithm": {"type": "string"}, "public_key": {"type": "string"}, "value": {"type": "string"} } + "required": ["hash_algorithm", "algorithm", "value"] } @@ -88,7 +93,8 @@ if __name__ == "__main__": logging.info("Modifying signature elements") js["$defs"]["HI1Message"]["patternProperties"] = {"^@": {"type": "string"}} js["$defs"]["HI1Message"]["properties"].pop("xmldsig:Signature") - js["$defs"]["HI1Message"]["properties"]["Signature"] = json_signature_struct + js["$defs"]["HI1Message"]["properties"]["Signatures"] = json__x590_signature_struct + if "output" in ns_map[schema_tuple[0]]: js_path = Path(ns_map[schema_tuple[0]]["output"]) / convert_xsd_to_filename( -- GitLab From fb87f10e3ee424395129d73436e380546bc514ac Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 14:12:24 +0000 Subject: [PATCH 02/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 103120/examples/json/response1_signed.json diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json new file mode 100644 index 0000000..c3d089c --- /dev/null +++ b/103120/examples/json/response1_signed.json @@ -0,0 +1,52 @@ +{ + "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", + "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", + "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", + "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", + "@xmlns:auth": "http://uri.etsi.org/03120/common/2020/09/Authorisation", + "Header": { + "SenderIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR01" + }, + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR02" + }, + "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e", + "Timestamp": "2015-09-01T12:00:01.000000Z", + "Version": { + "ETSIVersion": "V1.13.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "ResponsePayload": { + "ActionResponses": { + "ActionResponse": [ + { + "ActionIdentifier": 0, + "CREATEResponse": { + "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045" + } + }, + { + "ActionIdentifier": 1, + "CREATEResponse": { + "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36" + } + } + ] + } + } + }, + "signatures": [ + { + "hash_algorithm": "sha-256", + "algorithm": "Ed25519", + "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU", + "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" + } + ] + } \ No newline at end of file -- GitLab From ff58a25f5728913ba9dc0ccf47d36f6ffc1f6305 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 14:19:05 +0000 Subject: [PATCH 03/27] Update file ed25519_x590.key --- .../examples/json/response1_signed.json_keys/ed25519_x590.key | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 103120/examples/json/response1_signed.json_keys/ed25519_x590.key diff --git a/103120/examples/json/response1_signed.json_keys/ed25519_x590.key b/103120/examples/json/response1_signed.json_keys/ed25519_x590.key new file mode 100644 index 0000000..43c606a --- /dev/null +++ b/103120/examples/json/response1_signed.json_keys/ed25519_x590.key @@ -0,0 +1,3 @@ +-----BEGIN PRIVATE KEY----- +MC4CAQAwBQYDK2VwBCIEIDnZ5bPmXnB3OfU/5fNVfxfr7iRZtqH06AZ3b6c6liTL +-----END PRIVATE KEY----- \ No newline at end of file -- GitLab From 49e94347203f91829ebb2cca628b09fe0f78c418 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 14:22:34 +0000 Subject: [PATCH 04/27] Update file ed25519_x590.pub --- .../examples/json/response1_signed.json_keys/ed25519_x590.pub | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 103120/examples/json/response1_signed.json_keys/ed25519_x590.pub diff --git a/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub b/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub new file mode 100644 index 0000000..1fe8fbc --- /dev/null +++ b/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub @@ -0,0 +1,3 @@ +-----BEGIN PUBLIC KEY----- +MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU= +-----END PUBLIC KEY----- \ No newline at end of file -- GitLab From 974dc99fe3f8664885b222c1c1db071534bebaa4 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 14:37:35 +0000 Subject: [PATCH 05/27] Update file ts_103120_Core.schema.json --- 103120/schema/json/ts_103120_Core.schema.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json index 3216b8c..acaadc9 100644 --- a/103120/schema/json/ts_103120_Core.schema.json +++ b/103120/schema/json/ts_103120_Core.schema.json @@ -27,6 +27,27 @@ "protected", "signature" ] + }, + "Signatures": { + "properties": { + "hash_algorithm": { + "type": "string" + }, + "algorithm": { + "type": "string" + }, + "public_key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "required": [ + "hash_algorithm", + "algorithm", + "value" + ] } }, "required": [ -- GitLab From 17f76491ccaf7a4f19866222e88361e4ebd6f211 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Mon, 15 Jun 2026 15:00:11 +0000 Subject: [PATCH 06/27] Update file ts_103120_Core.schema.json --- 103120/schema/json/ts_103120_Core.schema.json | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json index acaadc9..3098c04 100644 --- a/103120/schema/json/ts_103120_Core.schema.json +++ b/103120/schema/json/ts_103120_Core.schema.json @@ -29,25 +29,30 @@ ] }, "Signatures": { - "properties": { - "hash_algorithm": { - "type": "string" - }, - "algorithm": { - "type": "string" - }, - "public_key": { - "type": "string" + "type": "array", + "minItems": 1, + "items": { + "type": "object", + "properties": { + "hash_algorithm": { + "type": "string" + }, + "algorithm": { + "type": "string" + }, + "public_key": { + "type": "string" + }, + "value": { + "type": "string" + } }, - "value": { - "type": "string" - } - }, - "required": [ - "hash_algorithm", - "algorithm", - "value" - ] + "required": [ + "hash_algorithm", + "algorithm", + "value" + ] + } } }, "required": [ -- GitLab From b4d98ec161f43d4bd754015088b67e3b6bf15df6 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 07:22:01 +0000 Subject: [PATCH 07/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index 323e8ef..dd77af9 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -13,6 +13,8 @@ + + 17 + @@ -204,4 +206,5 @@ + -- GitLab From 505f1808b92701ead2eaf37b2f51720da0e5ec37 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 12:46:30 +0000 Subject: [PATCH 08/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index dd77af9..91b7a03 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -206,5 +206,4 @@ - -- GitLab From 8833a0321c0edf7d036707289be35c2f8a18df2f Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 12:48:43 +0000 Subject: [PATCH 09/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index 91b7a03..dd77af9 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -206,4 +206,5 @@ + -- GitLab From 6d9c459b696738baded5a04ea645c924cca478d0 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 12:51:17 +0000 Subject: [PATCH 10/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index dd77af9..0c6ca25 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -14,7 +14,7 @@ - 17 + + -- GitLab From 218f1ca53f024bfa15e0f46dd5896bf31eccab2a Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 12:53:39 +0000 Subject: [PATCH 11/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index 0c6ca25..ff4cad3 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -206,5 +206,4 @@ - -- GitLab From 9585571077d6ed587af4480508424901c12ca8a6 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 12:57:51 +0000 Subject: [PATCH 12/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index ff4cad3..d00eaf4 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -206,4 +206,5 @@ + -- GitLab From 60b146aad06cbbc760a75656dc1c56911766ed06 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 13:07:10 +0000 Subject: [PATCH 13/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index d00eaf4..cc6a845 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -14,7 +14,7 @@ - + @@ -206,5 +206,5 @@ - + -- GitLab From 912c69cf4c773505392da1a6b41a2d6c9e1f1f8f Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 13:43:25 +0000 Subject: [PATCH 14/27] Update 2 files - /103120/examples/json/response1_signed.json_keys/ed25519_x590.key - /103120/examples/json/response1_signed.json_keys/ed25519_x590.pub --- .../examples/json/response1_signed.json_keys/ed25519_x590.key | 3 --- .../examples/json/response1_signed.json_keys/ed25519_x590.pub | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 103120/examples/json/response1_signed.json_keys/ed25519_x590.key delete mode 100644 103120/examples/json/response1_signed.json_keys/ed25519_x590.pub diff --git a/103120/examples/json/response1_signed.json_keys/ed25519_x590.key b/103120/examples/json/response1_signed.json_keys/ed25519_x590.key deleted file mode 100644 index 43c606a..0000000 --- a/103120/examples/json/response1_signed.json_keys/ed25519_x590.key +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PRIVATE KEY----- -MC4CAQAwBQYDK2VwBCIEIDnZ5bPmXnB3OfU/5fNVfxfr7iRZtqH06AZ3b6c6liTL ------END PRIVATE KEY----- \ No newline at end of file diff --git a/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub b/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub deleted file mode 100644 index 1fe8fbc..0000000 --- a/103120/examples/json/response1_signed.json_keys/ed25519_x590.pub +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PUBLIC KEY----- -MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU= ------END PUBLIC KEY----- \ No newline at end of file -- GitLab From 63b9553a9422f416125cd90d6c20fb5c0a75b0df Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 13:47:14 +0000 Subject: [PATCH 15/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index c3d089c..9ac8843 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -41,7 +41,7 @@ } } }, - "signatures": [ + "Signatures": [ { "hash_algorithm": "sha-256", "algorithm": "Ed25519", @@ -49,4 +49,4 @@ "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" } ] - } \ No newline at end of file +} -- GitLab From 67feb4f6612038513ed3fc373ad43ab23673a544 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 14:07:19 +0000 Subject: [PATCH 16/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 94 +++++++++++----------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index 9ac8843..c8560b9 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -1,52 +1,52 @@ { - "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", - "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", - "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", - "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", - "@xmlns:auth": "http://uri.etsi.org/03120/common/2020/09/Authorisation", - "Header": { - "SenderIdentifier": { - "CountryCode": "XX", - "UniqueIdentifier": "ACTOR01" - }, - "ReceiverIdentifier": { - "CountryCode": "XX", - "UniqueIdentifier": "ACTOR02" - }, - "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e", - "Timestamp": "2015-09-01T12:00:01.000000Z", - "Version": { - "ETSIVersion": "V1.13.1", - "NationalProfileOwner": "XX", - "NationalProfileVersion": "v1.0" - } + "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", + "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", + "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", + "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", + "@xmlns:auth": "http://uri.etsi.org/03120/common/2020/09/Authorisation", + "Header": { + "SenderIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR01" }, - "Payload": { - "ResponsePayload": { - "ActionResponses": { - "ActionResponse": [ - { - "ActionIdentifier": 0, - "CREATEResponse": { - "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045" - } - }, - { - "ActionIdentifier": 1, - "CREATEResponse": { - "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36" - } - } - ] - } - } + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR02" }, - "Signatures": [ - { - "hash_algorithm": "sha-256", - "algorithm": "Ed25519", - "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU", - "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" + "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e", + "Timestamp": "2015-09-01T12:00:01.000000Z", + "Version": { + "ETSIVersion": "V1.13.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "ResponsePayload": { + "ActionResponses": { + "ActionResponse": [ + { + "ActionIdentifier": 0, + "CREATEResponse": { + "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045" + } + }, + { + "ActionIdentifier": 1, + "CREATEResponse": { + "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36" + } + } + ] } - ] + } + }, + "Signatures": [ + { + "hash_algorithm": "sha-256", + "algorithm": "Ed25519", + "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU", + "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" + } + ] } -- GitLab From 4dea79182814a503bdac2e35376ad58e14704bf9 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 14:23:39 +0000 Subject: [PATCH 17/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index c8560b9..e6dca66 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -41,7 +41,7 @@ } } }, - "Signatures": [ + "Signatures": [ { "hash_algorithm": "sha-256", "algorithm": "Ed25519", -- GitLab From a095f20f3ffde23922553a9aa6108e0ccd42ac7f Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Tue, 16 Jun 2026 14:28:01 +0000 Subject: [PATCH 18/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index cc6a845..fc7a2ee 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -14,7 +14,7 @@ - + @@ -206,5 +206,5 @@ - + -- GitLab From 28ceab060dcf658649a6a77972b6a62cc45bb08c Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 06:58:56 +0000 Subject: [PATCH 19/27] Update file translate_spec.py --- utils/translate_spec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/translate_spec.py b/utils/translate_spec.py index cae7da7..3a28a59 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -16,8 +16,9 @@ json_signature_struct = { } json_x590_signature_struct = { + "type": "array", "minItems": 1, "items": {"type": "object", "properties": {"hash_algorithm": {"type": "string"}, "algorithm": {"type": "string"}, "public_key": {"type": "string"}, "value": {"type": "string"} } - "required": ["hash_algorithm", "algorithm", "value"] + "required": ["hash_algorithm", "algorithm", "value"] } } -- GitLab From e40f279cdb9f8bb401e53ede69286850f18f8952 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 07:53:37 +0000 Subject: [PATCH 20/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 96 ++++++++++------------ 1 file changed, 44 insertions(+), 52 deletions(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index e6dca66..3a97690 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -1,52 +1,44 @@ -{ - "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", - "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", - "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", - "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", - "@xmlns:auth": "http://uri.etsi.org/03120/common/2020/09/Authorisation", - "Header": { - "SenderIdentifier": { - "CountryCode": "XX", - "UniqueIdentifier": "ACTOR01" - }, - "ReceiverIdentifier": { - "CountryCode": "XX", - "UniqueIdentifier": "ACTOR02" - }, - "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e", - "Timestamp": "2015-09-01T12:00:01.000000Z", - "Version": { - "ETSIVersion": "V1.13.1", - "NationalProfileOwner": "XX", - "NationalProfileVersion": "v1.0" - } - }, - "Payload": { - "ResponsePayload": { - "ActionResponses": { - "ActionResponse": [ - { - "ActionIdentifier": 0, - "CREATEResponse": { - "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045" - } - }, - { - "ActionIdentifier": 1, - "CREATEResponse": { - "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36" - } - } - ] - } - } - }, - "Signatures": [ - { - "hash_algorithm": "sha-256", - "algorithm": "Ed25519", - "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU", - "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" - } - ] -} +{ + "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core", + "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", + "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common", + "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task", + "@xmlns:auth": "http://uri.etsi.org/03120/common/2020/09/Authorisation", + "Header": { + "SenderIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR01" + }, + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR02" + }, + "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e", + "Timestamp": "2015-09-01T12:00:01.000000Z", + "Version": { + "ETSIVersion": "V1.13.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "ResponsePayload": { + "ActionResponses": { + "ActionResponse": [ + { + "ActionIdentifier": 0, + "CREATEResponse": { + "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045" + } + }, + { + "ActionIdentifier": 1, + "CREATEResponse": { + "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36" + } + } + ] + } + } + } +} -- GitLab From dc16e6814b1775d4a8b0920c732b36d1508a1904 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 08:36:17 +0000 Subject: [PATCH 21/27] Update file translate_spec.py --- utils/translate_spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/translate_spec.py b/utils/translate_spec.py index 3a28a59..31d57f6 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -94,7 +94,7 @@ if __name__ == "__main__": logging.info("Modifying signature elements") js["$defs"]["HI1Message"]["patternProperties"] = {"^@": {"type": "string"}} js["$defs"]["HI1Message"]["properties"].pop("xmldsig:Signature") - js["$defs"]["HI1Message"]["properties"]["Signatures"] = json__x590_signature_struct + js["$defs"]["HI1Message"]["properties"]["Signatures"] = json_x590_signature_struct if "output" in ns_map[schema_tuple[0]]: -- GitLab From da092ff7e5f0e65e077afab80fc684f1dd0a953b Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 08:52:49 +0000 Subject: [PATCH 22/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index 3a97690..64a69ec 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -40,5 +40,13 @@ ] } } - } + }, + "signatures": [ + { + "hash_algorithm": "sha-256", + "algorithm": "Ed25519", + "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU", + "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA==" + } + ] } -- GitLab From a31d9a03ffaceed7f2843ae923ac86604e0c13db Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 09:01:22 +0000 Subject: [PATCH 23/27] Update file response1_signed.json --- 103120/examples/json/response1_signed.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/json/response1_signed.json b/103120/examples/json/response1_signed.json index 64a69ec..a30a3ff 100644 --- a/103120/examples/json/response1_signed.json +++ b/103120/examples/json/response1_signed.json @@ -41,7 +41,7 @@ } } }, - "signatures": [ + "Signatures": [ { "hash_algorithm": "sha-256", "algorithm": "Ed25519", -- GitLab From 2777424626193bb171ce48ef3eb829d10b1e2c6a Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 09:07:28 +0000 Subject: [PATCH 24/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index fc7a2ee..b4ad39d 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -14,7 +14,7 @@ - + @@ -206,5 +206,4 @@ - -- GitLab From 36bdcea51f91c633c21a45e4c571e842c17ed093 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 09:10:26 +0000 Subject: [PATCH 25/27] Update file ts_103120_Core.xsd --- 103120/schema/xsd/ts_103120_Core.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index b4ad39d..d30f694 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -14,7 +14,7 @@ - + -- GitLab From ac6097c861d6705661fd33753664308b52ebe0c4 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 09:13:40 +0000 Subject: [PATCH 26/27] Update file translate_spec.py --- utils/translate_spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/translate_spec.py b/utils/translate_spec.py index 31d57f6..614d368 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -18,7 +18,7 @@ json_signature_struct = { json_x590_signature_struct = { "type": "array", "minItems": 1, "items": {"type": "object", "properties": {"hash_algorithm": {"type": "string"}, "algorithm": {"type": "string"}, "public_key": {"type": "string"}, "value": {"type": "string"} } - "required": ["hash_algorithm", "algorithm", "value"] } + "required": ["haash_algorithm", "algorithm", "value"] } } -- GitLab From a5c0f21f1784d7736552b7ab0a50c58a5b3d8d93 Mon Sep 17 00:00:00 2001 From: Herbert Slaghekke Date: Thu, 18 Jun 2026 09:22:49 +0000 Subject: [PATCH 27/27] Update file translate_spec.py --- utils/translate_spec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/translate_spec.py b/utils/translate_spec.py index 614d368..6e3c987 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -18,7 +18,7 @@ json_signature_struct = { json_x590_signature_struct = { "type": "array", "minItems": 1, "items": {"type": "object", "properties": {"hash_algorithm": {"type": "string"}, "algorithm": {"type": "string"}, "public_key": {"type": "string"}, "value": {"type": "string"} } - "required": ["haash_algorithm", "algorithm", "value"] } + "required": ["hash_algorithm", "algorithm", "value"] } } @@ -94,6 +94,7 @@ if __name__ == "__main__": logging.info("Modifying signature elements") js["$defs"]["HI1Message"]["patternProperties"] = {"^@": {"type": "string"}} js["$defs"]["HI1Message"]["properties"].pop("xmldsig:Signature") + js["$defs"]["HI1Message"]["properties"]["Signature"] = json_signature_struct js["$defs"]["HI1Message"]["properties"]["Signatures"] = json_x590_signature_struct -- GitLab