Skip to content

Commit 1508252

Browse files
committed
various edits
* improved wording for changelog, JSF docs (and aligned XMLDSIG) * eliminated future tense (will) and strange vocabulary (fixated)
1 parent 79bde42 commit 1508252

5 files changed

Lines changed: 32 additions & 23 deletions

File tree

docs/_data/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version: 1.212.1
55
new_features:
66
- text: |-
7-
New [`<jsf-sign>`](/artifact-configuration/reference#jsf-sign) directive to sign JSON files (e.g. CycloneDX 1.x SBOMs) using JSF (JSON Signature Format).
7+
New [`<jsf-sign>`](/artifact-configuration/reference#jsf-sign) directive to sign JSON files using JSON Signature Format (JSF).
88
issues: [SIGN-8481, SIGN-8483]
99
bug_fixes:
1010
- text: |-
@@ -17,7 +17,7 @@
1717
version: 1.212.1
1818
improvements:
1919
- text: |-
20-
Now, similar to `signpath-application` chart Pods, also `signpath-signservice-<type>` Helm chart Pods are automatically restarted on Helm chart upgrades. In both charts this can be opted-out via `chartSettings.disableDeploymentRestartOnHelmUpgrade`.
20+
`signpath-signservice-<type>` Helm chart Pods are automatically restarted on Helm chart upgrades (as previously implemented for `signpath-application` chart Pods.) This can be opted out via `chartSettings.disableDeploymentRestartOnHelmUpgrade` for both charts.
2121
issues: [SIGN-6933]
2222
- date: '2026-05-07'
2323
updates:

docs/_data/tables/artifact-configuration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ signing-file-elements:
106106
isComposite: "No"
107107
directive: "[`<xml-sign>`](#xml-sign)"
108108
extensions: ".xml"
109-
description: "Use this directive to sign XML files using [XMLDSIG](https://www.w3.org/TR/xmldsig-core1/) (available for Advanced Code Signing). File size limit: 2 MB."
109+
description: "Sign XML files using [XMLDSIG](https://www.w3.org/TR/xmldsig-core1/) (available for Advanced Code Signing). File size limit: 2 MB."
110110
- element: "`<json-file>`"
111111
isComposite: "No"
112112
directive: "[`<jsf-sign>`](#jsf-sign)"
113113
extensions: ".json"
114-
description: "Use this directive to sign JSON files (e.g. CycloneDX 1.x SBOMs) using JSF (JSON Signature Format)."
114+
description: "Sign JSON files using [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html?)."
115115
- element: "`<oci-image-layout-archive-file>`"
116116
isComposite: "No"
117117
directive: |

docs/_sass/resources.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ main > section.resources-section {
225225
font-weight: 800;
226226
}
227227
}
228-
228+
229229
&.info {
230230
background-color: $light-grey-background-color;
231231
& > p:first-child::before,
@@ -272,7 +272,6 @@ main > section.resources-section {
272272
background-color: $grey-border-color;
273273
margin: 0px;
274274
padding: 5px 10px;
275-
font-weight: bold;
276275
font-size: 1em;
277276
margin-left: -20px;
278277
margin-right: -20px;

docs/artifact-configuration/reference.md

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signing directives are available for several code signing methods. There are thr
3737

3838
These signing methods add signatures to existing files. Several platforms including Windows, Apple, and Java provide a variety of file formats that support embedded signatures.
3939

40-
Since the file's format does not change, the unsigned files are not needed anymore. SignPath will only return the signed files in Signing Requests.
40+
Since the file's format does not change, the unsigned files are not needed anymore. SignPath only returns the signed files in Signing Requests.
4141

4242
#### Supported embedded formats
4343

@@ -193,7 +193,7 @@ Note that not all OPC-based formats use OPC signatures:
193193

194194
##### Verification {#jar-sign-verification}
195195

196-
* **Java** always verifies signatures for client components. For server components, you will need to create a policy. Please consult the documentation of your application server or [Oracle's documentation](https://docs.oracle.com/javase/tutorial/security/toolsign/receiver.html).
196+
* **Java** always verifies signatures for client components. For server components, you need to create a policy. Please consult the documentation of your application server or [Oracle's documentation](https://docs.oracle.com/javase/tutorial/security/toolsign/receiver.html).
197197
* **Android** always verifies App signatures, but current Android versions require signing schemes v2 or v3.
198198
* If you sign **ZIP files**, the receiver needs to manually check the signature before unpacking the file.
199199

@@ -307,11 +307,19 @@ The `dpkg` command internally uses [`debsig-verify`]. You can also use this tool
307307

308308
{% include editions.md feature="file_based_signing.xml" %}
309309

310+
{:.panel.tip}
311+
> XMLDSIG can be used to sign CycloneDX XML SBOMs.
312+
310313
{%- include_relative render-ac-directive-table.inc directive="xml-sign" -%}
311314

312315
Sign XML files with [XMLDSIG](https://www.w3.org/TR/xmldsig-core1/).
313316

314-
This will create an _enveloped signature_ for the entire document.
317+
This creates an _XMLDSIG enveloped signature_ for the entire document: a `<ds:Signature>` element is added to the existing root element.
318+
319+
{:.panel.info}
320+
> **Terminology**
321+
>
322+
> XMLDSIG terminology names this method [_enveloped signature_](https://www.w3.org/TR/xmldsig-core1/#def-SignatureEnveloped) although it does not create an envelope. Since it preserves the existing XML document and structure, it can be treated as an _embedded signature_ for most purpuses. However, the new element might break the root element's schema if signing is not expected by the target schema.
315323
316324
The result is a `Signature` element added to the root element (after all existing children) with the following properties:
317325

@@ -340,11 +348,14 @@ See also:
340348

341349
{% include editions.md feature="file_based_signing.jsf" %}
342350

351+
{:.panel.tip}
352+
> JSF can be used to sign CycloneDX v1.x JSON SBOMs.
353+
343354
{%- include_relative render-ac-directive-table.inc directive="jsf-sign" -%}
344355

345-
Sign JSON files (e.g. CycloneDX v1.x SBOMs) with the [JSF (JSON Signature Format)](https://cyberphone.github.io/doc/security/jsf.html).
356+
Sign JSON files with [JSON Signature Format (JSF))](https://cyberphone.github.io/doc/security/jsf.html).
346357

347-
This will create an _embedded signature_ for the entire document. The result is a `signature` property added on root level. Note that on root level an JSON object is expected, JSON arrays are not supported.
358+
This creates signature of the whole document: a `signature` property is added at the root level. Note that a JSON object is expected, JSON arrays are not supported at the root level.
348359

349360
**Supported options:**
350361

@@ -359,7 +370,7 @@ Sign container images using [Notation (Notary)](/signing-containers#notary).
359370

360371
{%- include_relative render-ac-directive-table.inc directive="notation-sign" -%}
361372

362-
This will place the signature at the right place within the OCI layout and add relevant references.
373+
This places the signature at the right place within the OCI layout and add relevant references.
363374

364375
**Supported options:**
365376

@@ -385,7 +396,7 @@ Sign container images using [Sigstore Cosign](/signing-containers#cosign).
385396

386397
{%- include_relative render-ac-directive-table.inc directive="cosign-sign" -%}
387398

388-
This will place the signature at the right place within the OCI layout and add relevant references.
399+
This places the signature at the right place within the OCI layout and add relevant references.
389400

390401
**Supported options:**
391402

@@ -409,7 +420,7 @@ _Note: You can create both [Notary](#notation-sign) and Cosign signatures for th
409420

410421
These signing methods create new files that contain both the original file and the signature. Enveloped signatures are available for all file types using the `<file>` element. Since the signed file is _added_, this `<file>` element must be contained in a `<zip-file>` element.
411422

412-
While the original file is still available, it often needs to be extracted from the enveloped file in order to be used, ideally after sucessful signature verification. SignPath will preserve the original files in Signing Requests.
423+
While the original file is still available, it often needs to be extracted from the enveloped file in order to be used, ideally after sucessful signature verification. SignPath preserves the original files in Signing Requests.
413424

414425
#### Supported enveloped formats
415426

@@ -459,8 +470,7 @@ This example signs SLSA Verification Summary Attestations using DSSE:
459470
</artifact-configuration>
460471
~~~
461472

462-
The resulting artifact will contain both the original file `slsa-vsa.json` and the enveloped signature`slsa-vsa.dsse`.
463-
473+
The resulting artifact contains both the original file `slsa-vsa.json` and the enveloped signature`slsa-vsa.dsse`.
464474

465475
#### `<smime-sign>`: S/MIME signing {#smime-sign}
466476

@@ -523,7 +533,7 @@ openssl smime -verify -purpose codesign -in "hashes.txt.msg" -out "hashes.txt"
523533

524534
These signing methods create new files that contain the signature and a cryptographic hash code of the original file. Detached signatures are available for all file types using the `<file>` element. Since the signature file is _added_, this `<file>` element must be contained in a `<zip-file>` element.
525535

526-
For signature verification, both the original file and the detached signature must be present. SignPath will preserve the original files in Signing Requests.
536+
For signature verification, both the original file and the detached signature must be present. SignPath preserves the original files in Signing Requests.
527537

528538
#### Supported detached formats
529539

@@ -570,7 +580,7 @@ The `create-cms-signature` directive supports the following parameters:
570580
</artifact-configuration>
571581
~~~
572582

573-
The resulting artifact will contain both the original file `myfile.bin` and the detached signature in `myfile.bin.cms.pem`.
583+
The resulting artifact contains both the original file `myfile.bin` and the detached signature in `myfile.bin.cms.pem`.
574584

575585
##### CMS signature verification
576586

@@ -610,7 +620,7 @@ The `create-gpg-signature` directive supports the following parameters:
610620
| `output-file-name` | (mandatory) | | Name of the output file containing the signature. Use `${file.name}` to reference the source file name.
611621
| `output-encoding` | `ascii-armored` | `ascii-armored`, `binary` | The encoding of the output file containing the signature. Either [ASCII armored, i.e. text-only](https://datatracker.ietf.org/doc/html/rfc4880#section-6.2) (default) or the binary OpenPGP packet format.
612622
| `hash-algorithm` | `sha256` | `sha256`, `sha384`, `sha512` | Hash algorithm used to create the signature.
613-
| `version` | `4` | `4` | Specifies the [signature version](https://datatracker.ietf.org/doc/html/rfc4880#section-5.2). Currently only `4` is supported, the attribute is intended to allow to fixate the version in case the default version will be changed in the future.
623+
| `version` | `4` | `4` | Specifies the [signature version](https://datatracker.ietf.org/doc/html/rfc4880#section-5.2). Currently only `4` is supported, the attribute is intended to allow pinning the version in case the default version changeds in the future.
614624

615625
##### Example
616626

@@ -624,7 +634,7 @@ The `create-gpg-signature` directive supports the following parameters:
624634
</artifact-configuration>
625635
~~~
626636

627-
The resulting artifact will contain both the original file `myfile.bin` and the detached signature in `myfile.bin.asc`.
637+
The resulting artifact contains both the original file `myfile.bin` and the detached signature in `myfile.bin.asc`.
628638

629639
##### GPG signature verification
630640

@@ -676,7 +686,7 @@ The `create-raw-signature` directive supports the following parameters:
676686
</artifact-configuration>
677687
~~~
678688

679-
The resulting artifact will contain both the original file `myfile.bin` and the detached signature in `myfile.bin.sig`.
689+
The resulting artifact contains both the original file `myfile.bin` and the detached signature in `myfile.bin.sig`.
680690

681691
##### Raw signature verification
682692

docs/trusted-build-systems/github.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ We provide a [`submit-signing-request` action](https://github.com/SignPath/githu
4343
```yaml
4444
steps:
4545
# required for the artifact to be available on the GitHub server
46-
- name: upload-unsigned-artifact
46+
- name: upload unsigned artifact
4747
id: upload-unsigned-artifact
4848
uses: actions/upload-artifact@v7
4949
with:
5050
path: path/to/your/artifact
5151

52-
- id: optional_step_id
52+
- name: submit signing request
5353
uses: signpath/github-action-submit-signing-request@v2
5454
with:
5555
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'

0 commit comments

Comments
 (0)