From fe513050635c6cac2141253ba114cb7f5b7aca3d Mon Sep 17 00:00:00 2001 From: Mehrn0ush Date: Thu, 12 Nov 2026 11:54:51 +0400 Subject: [PATCH 1/3] docs(2.0): correct relatedCryptographicAsset type description Signed-off-by: Mehrn0ush --- schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json b/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json index e84ef647e..a107cda24 100644 --- a/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json +++ b/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json @@ -1038,17 +1038,18 @@ "relatedCryptographicAsset": { "type": "object", "title": "Related Cryptographic Asset", - "description": "A cryptographic assets related to this component.", + "description": "A cryptographic asset related to this component.", "additionalProperties": false, "properties": { "type": { "type": "string", "title": "Type", - "description": "Specifies the mechanism by which the cryptographic asset is secured by.", + "description": "The kind of referenced cryptographic asset, such as an algorithm, certificate, public key, or private key.", "examples": [ "publicKey", "privateKey", - "algorithm" + "algorithm", + "certificate" ] }, "ref": { From c11c279709d15a9f0c40e62dd26f6a56b3b89c8b Mon Sep 17 00:00:00 2001 From: Mehrn0ush Date: Thu, 12 Nov 2026 12:40:59 +0400 Subject: [PATCH 2/3] docs(2.0): use public-key and private-key in relatedCryptographicAsset type examples Signed-off-by: Mehrn0ush --- schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json b/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json index a107cda24..769e3ac53 100644 --- a/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json +++ b/schema/2.0/modules/cyclonedx-cryptography-2.0.schema.json @@ -1046,8 +1046,8 @@ "title": "Type", "description": "The kind of referenced cryptographic asset, such as an algorithm, certificate, public key, or private key.", "examples": [ - "publicKey", - "privateKey", + "public-key", + "private-key", "algorithm", "certificate" ] From 53e449f691ccbcb09b6b83b6c97db1685898c4d8 Mon Sep 17 00:00:00 2001 From: Mehrn0ush Date: Thu, 12 Nov 2026 12:47:15 +0400 Subject: [PATCH 3/3] test(2.0): use public-key in relatedCryptographicAsset type fixtures Signed-off-by: Mehrn0ush --- .../resources/2.0/valid-cryptography-certificate-2.0.json | 2 +- .../2.0/valid-cryptography-certificate-advanced-2.0.json | 4 ++-- tools/src/test/resources/2.0/valid-cryptography-full-2.0.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/src/test/resources/2.0/valid-cryptography-certificate-2.0.json b/tools/src/test/resources/2.0/valid-cryptography-certificate-2.0.json index c05da003c..245e59b84 100644 --- a/tools/src/test/resources/2.0/valid-cryptography-certificate-2.0.json +++ b/tools/src/test/resources/2.0/valid-cryptography-certificate-2.0.json @@ -48,7 +48,7 @@ "ref": "6b00f384-6c39-420f-91eb-94de0f7be569" }, { - "type": "publicKey", + "type": "public-key", "ref": "ceb37320-8239-40e8-ab77-8798dbd98773" } ] diff --git a/tools/src/test/resources/2.0/valid-cryptography-certificate-advanced-2.0.json b/tools/src/test/resources/2.0/valid-cryptography-certificate-advanced-2.0.json index 7ab898291..501b2708d 100644 --- a/tools/src/test/resources/2.0/valid-cryptography-certificate-advanced-2.0.json +++ b/tools/src/test/resources/2.0/valid-cryptography-certificate-advanced-2.0.json @@ -103,7 +103,7 @@ "ref": "2A0DA4D2-BBCA-4515-9BCD-C870A3EA4CE8" }, { - "type": "publicKey", + "type": "public-key", "ref": "ACCAF8BC-5F73-4869-A3FE-1C64E8D96408" } ] @@ -174,7 +174,7 @@ "ref": "14478B86-9306-45B5-BA2A-1660B723244C" }, { - "type": "publicKey", + "type": "public-key", "ref": "F1F3D902-0A1B-4C0C-9F6A-F36E041B0B7D" } ] diff --git a/tools/src/test/resources/2.0/valid-cryptography-full-2.0.json b/tools/src/test/resources/2.0/valid-cryptography-full-2.0.json index 67e031048..851c8f291 100644 --- a/tools/src/test/resources/2.0/valid-cryptography-full-2.0.json +++ b/tools/src/test/resources/2.0/valid-cryptography-full-2.0.json @@ -335,7 +335,7 @@ "ref": "algorithm-rsa-sha256" }, { - "type": "publicKey", + "type": "public-key", "ref": "key-rsa-4096-public" } ]