Skip to content

Migrate enveloped signature support from JSF to JSS #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevespringett wants to merge 3 commits into
base: 2.0-dev
Choose a base branch
from
Open

Migrate enveloped signature support from JSF to JSS #858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8147988
Migrated enveloped signature support from JSF to JSS. Expanded on the…
stevespringett Mar 1, 2026
ef10479
Removed unnecessary title and description from signatures throughout …
stevespringett May 4, 2026
7d3546b
Updated test cases with valid signature blocks
stevespringett May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions schema/2.0/cyclonedx-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"externalReferences": {
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
},
"signature": {
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/signature"
"signatures": {
"$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/signatures"
}
},
"allOf": [
Expand Down
4 changes: 2 additions & 2 deletions schema/2.0/model/cyclonedx-annotation-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
"title": "Text",
"description": "The textual content of the annotation."
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down
4 changes: 2 additions & 2 deletions schema/2.0/model/cyclonedx-citation-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"title": "Note",
"description": "A description or comment about the context or quality of the data attribution."
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "A digital signature verifying the authenticity or integrity of the attribution."
}
Expand Down
8 changes: 4 additions & 4 deletions schema/2.0/model/cyclonedx-common-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,10 +763,10 @@
"title": "Locale",
"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"
},
"signature": {
"$ref": "../jsf-0.82.schema.json#/definitions/signature",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
"signatures": {
"$ref": "cyclonedx-jss_X590_2023_10-2.0.schema.json#/$defs/signatures",
"title": "Signatures",
"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)."
}
}
}
4 changes: 2 additions & 2 deletions schema/2.0/model/cyclonedx-component-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@
"externalReferences": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down
4 changes: 2 additions & 2 deletions schema/2.0/model/cyclonedx-composition-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"title": "BOM references",
"description": "The bom-ref identifiers of the vulnerabilities being described."
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down
24 changes: 12 additions & 12 deletions schema/2.0/model/cyclonedx-declaration-2.0.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
}
}
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down Expand Up @@ -191,8 +191,8 @@
"externalReferences": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/externalReferences"
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down Expand Up @@ -296,8 +296,8 @@
"title": "Reviewer",
"description": "The reviewer of the evidence."
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down Expand Up @@ -369,8 +369,8 @@
"title": "Role",
"description": "The signatory's role within an organization."
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
},
Expand All @@ -385,15 +385,15 @@
}
}
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
}
},
"signature": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signature",
"signatures": {
"$ref": "cyclonedx-common-2.0.schema.json#/$defs/signatures",
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
Comment thread
stevespringett marked this conversation as resolved.
Outdated
}
Expand Down
Loading