Skip to content

Commit 8147988

Browse files
Migrated enveloped signature support from JSF to JSS. Expanded on the number of valid and invalid use cases.
Signed-off-by: Steve Springett <steve@springett.us>
1 parent ae266d4 commit 8147988

29 files changed

Lines changed: 704 additions & 109 deletions

schema/2.0/cyclonedx-2.0.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"externalReferences": {
8686
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
8787
},
88-
"signature": {
89-
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/signature"
88+
"signatures": {
89+
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/signatures"
9090
}
9191
},
9292
"allOf": [

schema/2.0/model/cyclonedx-annotation-2.0.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@
104104
"title": "Text",
105105
"description": "The textual content of the annotation."
106106
},
107-
"signature": {
108-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
107+
"signatures": {
108+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
109109
"title": "Signature",
110110
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
111111
}

schema/2.0/model/cyclonedx-citation-2.0.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"title": "Note",
6666
"description": "A description or comment about the context or quality of the data attribution."
6767
},
68-
"signature": {
69-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
68+
"signatures": {
69+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
7070
"title": "Signature",
7171
"description": "A digital signature verifying the authenticity or integrity of the attribution."
7272
}

schema/2.0/model/cyclonedx-common-2.0.schema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -763,10 +763,10 @@
763763
"title": "Locale",
764764
"description": "Defines a syntax for representing two character language code (ISO-639) followed by an optional two character country code. The language code must be lower case. If the country code is specified, the country code must be upper case. The language code and country code must be separated by a minus sign. Examples: en, en-US, fr, fr-CA"
765765
},
766-
"signature": {
767-
"$ref": "../jsf-0.82.schema.json#/definitions/signature",
768-
"title": "Signature",
769-
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
766+
"signatures": {
767+
"$ref": "cyclonedx-jss_X590_2023_10-2.0.schema.json#/$defs/signatures",
768+
"title": "Signatures",
769+
"description": "Enveloped signatures in [JSON Signature Scheme (JSS/ITU-T X.590)](https://www.itu.int/epublications/publication/itu-t-x-590-2023-10-json-signature-scheme-jss)."
770770
}
771771
}
772772
}

schema/2.0/model/cyclonedx-component-2.0.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@
274274
"externalReferences": {
275275
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
276276
},
277-
"signature": {
278-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
277+
"signatures": {
278+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
279279
"title": "Signature",
280280
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
281281
}

schema/2.0/model/cyclonedx-composition-2.0.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
"title": "BOM references",
6767
"description": "The bom-ref identifiers of the vulnerabilities being described."
6868
},
69-
"signature": {
70-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
69+
"signatures": {
70+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
7171
"title": "Signature",
7272
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
7373
}

schema/2.0/model/cyclonedx-declaration-2.0.schema.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
}
134134
}
135135
},
136-
"signature": {
137-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
136+
"signatures": {
137+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
138138
"title": "Signature",
139139
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
140140
}
@@ -191,8 +191,8 @@
191191
"externalReferences": {
192192
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
193193
},
194-
"signature": {
195-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
194+
"signatures": {
195+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
196196
"title": "Signature",
197197
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
198198
}
@@ -296,8 +296,8 @@
296296
"title": "Reviewer",
297297
"description": "The reviewer of the evidence."
298298
},
299-
"signature": {
300-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
299+
"signatures": {
300+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
301301
"title": "Signature",
302302
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
303303
}
@@ -369,8 +369,8 @@
369369
"title": "Role",
370370
"description": "The signatory's role within an organization."
371371
},
372-
"signature": {
373-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
372+
"signatures": {
373+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
374374
"title": "Signature",
375375
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
376376
},
@@ -385,15 +385,15 @@
385385
}
386386
}
387387
},
388-
"signature": {
389-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
388+
"signatures": {
389+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
390390
"title": "Signature",
391391
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
392392
}
393393
}
394394
},
395-
"signature": {
396-
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
395+
"signatures": {
396+
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
397397
"title": "Signature",
398398
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
399399
}

0 commit comments

Comments
 (0)