Skip to content

Commit 94141ea

Browse files
bhessbhess
committed
Schema Fixes
Signed-off-by: Basil Hess <bhe@zurich.ibm.com>
1 parent 6e24424 commit 94141ea

File tree

2 files changed

+64
-48
lines changed

2 files changed

+64
-48
lines changed

‎schema/bom-1.7.schema.json‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5536,12 +5536,12 @@
55365536
{
55375537
"title": "Common Extensions",
55385538
"required": [
5539-
"name",
5540-
"value"
5539+
"commonExtensionName",
5540+
"commonExtensionValue"
55415541
],
55425542
"additionalProperties": false,
55435543
"properties": {
5544-
"name": {
5544+
"commonExtensionName": {
55455545
"type": "string",
55465546
"title": "name",
55475547
"description": "The name of the extension.",
@@ -5570,7 +5570,7 @@
55705570
"signedCertificateTimestamp": "Shows that the certificate has been publicly logged, which helps prevent the issuance of rogue certificates by a CA. Log ID, timestamp and signature as proof."
55715571
}
55725572
},
5573-
"value": {
5573+
"commonExtensionValue": {
55745574
"type": "string",
55755575
"title": "Value",
55765576
"description": "The value of the certificate extension."
@@ -5581,16 +5581,16 @@
55815581
"title": "Custom Extensions",
55825582
"description": "Custom extensions may convey application-specific or vendor-specific data not covered by standard extensions. The structure and semantics of custom extensions are typically defined outside of public standards. CycloneDX leverages properties to support this capability.",
55835583
"required": [
5584-
"name"
5584+
"customExtensionName"
55855585
],
55865586
"additionalProperties": false,
55875587
"properties": {
5588-
"name": {
5588+
"customExtensionName": {
55895589
"type": "string",
55905590
"title": "Name",
55915591
"description": "The name for the custom certificate extension."
55925592
},
5593-
"value": {
5593+
"customExtensionValue": {
55945594
"type": "string",
55955595
"title": "Value",
55965596
"description": "The description of the custom certificate extension."
@@ -5802,27 +5802,40 @@
58025802
"additionalProperties": false,
58035803
"properties": {
58045804
"encr": {
5805-
"type": "string",
5805+
"type": "array",
58065806
"title": "Encryption Algorithms (ENCR)",
5807-
"description": "Transform Type 1: encryption algorithms"
5808-
},
5807+
"description": "Transform Type 1: encryption algorithms",
5808+
"items": {
5809+
"$ref": "#/definitions/ikeV2Enc",
5810+
"title": "Encryption Algorithm (ENCR)"
5811+
}
5812+
},
58095813
"prf": {
58105814
"type": "array",
5811-
"$ref": "#/definitions/ikeV2Prf",
58125815
"title": "Pseudorandom Functions (PRF)",
5813-
"description": "Transform Type 2: pseudorandom functions"
5816+
"description": "Transform Type 2: pseudorandom functions",
5817+
"items": {
5818+
"$ref": "#/definitions/ikeV2Prf",
5819+
"title": "Pseudorandom Function (PRF)"
5820+
}
58145821
},
58155822
"integ": {
58165823
"type": "array",
5817-
"$ref": "#/definitions/ikeV2Integ",
58185824
"title": "Integrity Algorithms (INTEG)",
5819-
"description": "Transform Type 3: integrity algorithms"
5825+
"description": "Transform Type 3: integrity algorithms",
5826+
"items": {
5827+
"$ref": "#/definitions/ikeV2Integ",
5828+
"title": "Integrity Algorithm (INTEG)"
5829+
}
58205830
},
58215831
"ke": {
58225832
"type": "array",
5823-
"$ref": "#/definitions/ikeV2Ke",
58245833
"title": "Key Exchange Methods (KE)",
5825-
"description": "Transform Type 4: Key Exchange Method (KE) per [RFC 9370](https://www.ietf.org/rfc/rfc9370.html), formerly called Diffie-Hellman Group (D-H)."
5834+
"description": "Transform Type 4: Key Exchange Method (KE) per [RFC 9370](https://www.ietf.org/rfc/rfc9370.html), formerly called Diffie-Hellman Group (D-H).",
5835+
"items": {
5836+
"$ref": "#/definitions/ikeV2Ke",
5837+
"title": "Key Exchange Method (KE)"
5838+
}
58265839
},
58275840
"esn": {
58285841
"type": "boolean",
@@ -5831,9 +5844,12 @@
58315844
},
58325845
"auth": {
58335846
"type": "array",
5834-
"$ref": "#/definitions/ikeV2Auth",
58355847
"title": "IKEv2 Authentication methods",
5836-
"description": "IKEv2 Authentication method per [RFC9593](https://www.ietf.org/rfc/rfc9593.html)."
5848+
"description": "IKEv2 Authentication method per [RFC9593](https://www.ietf.org/rfc/rfc9593.html).",
5849+
"items": {
5850+
"$ref": "#/definitions/ikeV2Auth",
5851+
"title": "IKEv2 Authentication Method"
5852+
}
58375853
}
58385854
}
58395855
},

‎tools/src/test/resources/1.7/valid-cryptography-certificate-advanced-1.7.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,52 +41,52 @@
4141
"revocationDate": "2024-01-10T15:45:30Z",
4242
"certificateExtensions": [
4343
{
44-
"extension": "basicConstraints",
45-
"value": "CA:TRUE, pathlen:2"
44+
"commonExtensionName": "basicConstraints",
45+
"commonExtensionValue": "CA:TRUE, pathlen:2"
4646
},
4747
{
48-
"extension": "keyUsage",
49-
"value": "Certificate Sign, CRL Sign, Digital Signature"
48+
"commonExtensionName": "keyUsage",
49+
"commonExtensionValue": "Certificate Sign, CRL Sign, Digital Signature"
5050
},
5151
{
52-
"extension": "extendedKeyUsage",
53-
"value": "TLS Web Server Authentication, TLS Web Client Authentication"
52+
"commonExtensionName": "extendedKeyUsage",
53+
"commonExtensionValue": "TLS Web Server Authentication, TLS Web Client Authentication"
5454
},
5555
{
56-
"extension": "subjectAlternativeName",
57-
"value": "DNS:internal-ca.example.com, DNS:ca.internal.example.com, IP:192.168.1.100"
56+
"commonExtensionName": "subjectAlternativeName",
57+
"commonExtensionValue": "DNS:internal-ca.example.com, DNS:ca.internal.example.com, IP:192.168.1.100"
5858
},
5959
{
60-
"extension": "authorityKeyIdentifier",
61-
"value": "keyid:01:02:03:04:05:06:07:08:09:0A:0B:0C:0D:0E:0F:10:11:12:13:14"
60+
"commonExtensionName": "authorityKeyIdentifier",
61+
"commonExtensionValue": "keyid:01:02:03:04:05:06:07:08:09:0A:0B:0C:0D:0E:0F:10:11:12:13:14"
6262
},
6363
{
64-
"extension": "subjectKeyIdentifier",
65-
"value": "A1:B2:C3:D4:E5:F6:07:08:09:0A:0B:0C:0D:0E:0F:10:11:12:13:14"
64+
"commonExtensionName": "subjectKeyIdentifier",
65+
"commonExtensionValue": "A1:B2:C3:D4:E5:F6:07:08:09:0A:0B:0C:0D:0E:0F:10:11:12:13:14"
6666
},
6767
{
68-
"extension": "crlDistributionPoints",
69-
"value": "URI:http://crl.example.com/root-ca.crl"
68+
"commonExtensionName": "crlDistributionPoints",
69+
"commonExtensionValue": "URI:http://crl.example.com/root-ca.crl"
7070
},
7171
{
72-
"extension": "authorityInformationAccess",
73-
"value": "OCSP - URI:http://ocsp.example.com, CA Issuers - URI:http://certs.example.com/root-ca.crt"
72+
"commonExtensionName": "authorityInformationAccess",
73+
"commonExtensionValue": "OCSP - URI:http://ocsp.example.com, CA Issuers - URI:http://certs.example.com/root-ca.crt"
7474
},
7575
{
76-
"extension": "certificatePolicies",
77-
"value": "Policy: 1.2.3.4.5.6.7.8.1, CPS: http://www.example.com/cps"
76+
"commonExtensionName": "certificatePolicies",
77+
"commonExtensionValue": "Policy: 1.2.3.4.5.6.7.8.1, CPS: http://www.example.com/cps"
7878
},
7979
{
80-
"name": "organizationalSecurityLevel",
81-
"value": "HIGH"
80+
"customExtensionName": "organizationalSecurityLevel",
81+
"customExtensionValue": "HIGH"
8282
},
8383
{
84-
"name": "incidentTrackingId",
85-
"value": "SEC-2024-001"
84+
"customExtensionName": "incidentTrackingId",
85+
"customExtensionValue": "SEC-2024-001"
8686
},
8787
{
88-
"name": "complianceFramework",
89-
"value": "SOX, PCI-DSS Level 1, ISO 27001"
88+
"customExtensionName": "complianceFramework",
89+
"customExtensionValue": "SOX, PCI-DSS Level 1, ISO 27001"
9090
}
9191
],
9292
"relatedCryptographicAssets": [
@@ -148,16 +148,16 @@
148148
"commonExtensionValue": "Log ID: ABCD1234..., Timestamp: 2024-01-01T00:00:00Z, Signature: 3045022100..."
149149
},
150150
{
151-
"commonExtensionName": "deploymentEnvironment",
152-
"commonExtensionValue": "PRODUCTION"
151+
"customExtensionName": "deploymentEnvironment",
152+
"customExtensionValue": "PRODUCTION"
153153
},
154154
{
155-
"commonExtensionName": "businessCriticality",
156-
"commonExtensionValue": "CRITICAL"
155+
"customExtensionName": "businessCriticality",
156+
"customExtensionValue": "CRITICAL"
157157
},
158158
{
159-
"commonExtensionName": "autoRenewalEnabled",
160-
"commonExtensionValue": "true"
159+
"customExtensionName": "autoRenewalEnabled",
160+
"customExtensionValue": "true"
161161
}
162162
],
163163
"relatedCryptographicAssets": [

0 commit comments

Comments
 (0)