Skip to content

Commit

Permalink
Merge pull request #77 from kentakayama/editorial-v22
Browse files Browse the repository at this point in the history
[Editorial] use cbor-pretty for CBOR hex binaries
  • Loading branch information
hannestschofenig authored Jan 7, 2025
2 parents 38f37b9 + c3b8528 commit b525cc8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions cddls/aeskw.cddl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ empty_map = {}

recipient_header_unpr_map_aeskw =
{
? 1 => int / tstr, ; content encryption algorithm identifier
? 4 => bstr, ; identifier of the KEK pre-shared with the recipient
? 1 => int / tstr, ; content encryption algorithm identifier
? 4 => bstr, ; identifier of the KEK
; pre-shared with the recipient
* label => values ; extension point
}
20 changes: 10 additions & 10 deletions draft-ietf-suit-firmware-encryption.md
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-aes-kw-aes-gcm.hex}
~~~

Expand Down Expand Up @@ -706,7 +706,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-es-ecdh-aes-gcm.hex}
~~~

Expand Down Expand Up @@ -781,7 +781,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-aes-kw-aes-ctr.hex}
~~~

Expand Down Expand Up @@ -820,7 +820,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-es-ecdh-aes-ctr.hex}
~~~

Expand Down Expand Up @@ -898,7 +898,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-aes-kw-aes-cbc.hex}
~~~

Expand Down Expand Up @@ -937,7 +937,7 @@ This example uses the following parameters:

The COSE_Encrypt structure, in hex format, is (with a line break inserted):

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-encryption-info-es-ecdh-aes-cbc.hex}
~~~

Expand Down Expand Up @@ -1252,7 +1252,7 @@ The SUIT manifest in diagnostic notation (with line breaks added for clarity) is

In hex format, the SUIT manifest is:

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-manifest-aes-kw-content.hex.signed}
~~~

Expand Down Expand Up @@ -1314,7 +1314,7 @@ The resulting state of the SUIT manifest processor is shown in {{table-suit-proc

In hex format, the SUIT manifest shown above is:

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-manifest-aes-kw.hex.signed}
~~~

Expand Down Expand Up @@ -1348,7 +1348,7 @@ is presented below:

In hex format, the SUIT manifest is this:

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-manifest-es-ecdh-content.hex.signed}
~~~

Expand Down Expand Up @@ -1378,7 +1378,7 @@ readability) is shown here:

In hex format, the SUIT manifest is this:

~~~ test-vectors
~~~ cbor-pretty
{::include-fold examples/suit-manifest-es-ecdh-dependency.hex.signed}
~~~

Expand Down

0 comments on commit b525cc8

Please sign in to comment.