From b9b3c18ae5b6b2e9024f4a02167ab66e8e3b1e1e Mon Sep 17 00:00:00 2001 From: steve lasker Date: Tue, 22 Oct 2024 16:19:35 -0700 Subject: [PATCH 1/8] add tstr support for pre-image-content-type Signed-off-by: steve lasker --- draft-ietf-cose-hash-envelope.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index 5757aaa..9526b46 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -107,7 +107,7 @@ Hash_Envelope_Protected_Header = { ; (content to be hashed) of the payload ; 50 for application/json, ; See https://datatracker.ietf.org/doc/html/rfc7252#section-12.3 - &(payload_preimage_content_type: TBD_2) => int + &(payload_preimage_content_type: TBD_2) => int / tstr ; Location the content of the hashed payload is stored ; For example: @@ -207,9 +207,11 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Name: payload_preimage_content_type - Label: TBD_2 -- Value type: int -- Value registry: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats +- Value type: int / tstr +- Value registry when `int` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats - Description: The content format associated with the bytes that were hashed to produce the payload. + `int` payload_preimage_content_types SHOULD be registered in the content-formats registry. + `str` values MAY be used when registered values may not yet be registered. ### Payload Location From a377293b52a5e2a5fe97fbdf804f3818dea7871d Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Tue, 3 Dec 2024 07:33:10 -0800 Subject: [PATCH 2/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Henk Birkholz --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index f08b756..acaa497 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -190,7 +190,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Name: payload_preimage_content_type - Label: TBD_2 - Value type: int / tstr -- Value registry when `int` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats +- Value registry when `uint` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats - Description: The content format associated with the bytes that were hashed to produce the payload. `int` payload_preimage_content_types SHOULD be registered in the content-formats registry. `str` values MAY be used when registered values may not yet be registered. From ae5d2f39eb9667b29ead1f909219f23ad6d90947 Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Tue, 3 Dec 2024 07:33:29 -0800 Subject: [PATCH 3/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Henk Birkholz --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index acaa497..c7a546f 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -189,7 +189,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Name: payload_preimage_content_type - Label: TBD_2 -- Value type: int / tstr +- Value type: uint / tstr - Value registry when `uint` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats - Description: The content format associated with the bytes that were hashed to produce the payload. `int` payload_preimage_content_types SHOULD be registered in the content-formats registry. From 9a436e4eca08e612a45362f6d44a4821ba7f6f7e Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Tue, 3 Dec 2024 07:33:38 -0800 Subject: [PATCH 4/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Henk Birkholz --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index c7a546f..cd5ce12 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -192,7 +192,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Value type: uint / tstr - Value registry when `uint` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats - Description: The content format associated with the bytes that were hashed to produce the payload. - `int` payload_preimage_content_types SHOULD be registered in the content-formats registry. + `uint` payload_preimage_content_types SHOULD be registered in the content-formats registry. `str` values MAY be used when registered values may not yet be registered. ### Payload Location From 8f7fe56505ce516921bf6a6eaba8761b3e5977ec Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Tue, 3 Dec 2024 07:33:55 -0800 Subject: [PATCH 5/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Henk Birkholz --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index cd5ce12..41af838 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -193,7 +193,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Value registry when `uint` is used: https://www.iana.org/assignments/core-parameters/core-parameters.xhtml#content-formats - Description: The content format associated with the bytes that were hashed to produce the payload. `uint` payload_preimage_content_types SHOULD be registered in the content-formats registry. - `str` values MAY be used when registered values may not yet be registered. + `tstr` values MAY be used when registered values may not yet be registered. ### Payload Location From 2b1a797c33c0bfccf819be6f977e3b47e5cddf09 Mon Sep 17 00:00:00 2001 From: steve lasker Date: Tue, 3 Dec 2024 14:45:10 -0800 Subject: [PATCH 6/8] Change content_type and type to unit consistently Signed-off-by: steve lasker --- draft-ietf-cose-hash-envelope.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index 41af838..49ee383 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -93,9 +93,9 @@ TBD_3: ~~~ cddl Hash_Envelope_Protected_Header = { ? &(alg: 1) => int, - ? &(typ: 16) => int / tstr - &(payload_hash_alg: TBD_1) => int - &(payload_preimage_content_type: TBD_2) => int / tstr + ? &(typ: 16) => uint / tstr + &(payload_hash_alg: TBD_1) => uint + &(payload_preimage_content_type: TBD_2) => uint / tstr ? &(payload_location: TBD_3) => tstr * int / tstr => any } @@ -181,7 +181,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Name: payload_hash_alg - Label: TBD_1 -- Value type: int +- Value type: uint - Value registry: https://www.iana.org/assignments/cose/cose.xhtml#algorithms - Description: Hash algorithm used to produce the payload from pre-image content From 67752a07fd9eac85671a2e8ef79bc800526dfe41 Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Wed, 4 Dec 2024 13:22:58 -0800 Subject: [PATCH 7/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Orie Steele --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index 49ee383..93fdc45 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -181,7 +181,7 @@ IANA is requested to add the following entries to the [COSE Header Algorithm Par - Name: payload_hash_alg - Label: TBD_1 -- Value type: uint +- Value type: int - Value registry: https://www.iana.org/assignments/cose/cose.xhtml#algorithms - Description: Hash algorithm used to produce the payload from pre-image content From b16c68539a1384b2cbd8e78d9b077c8e464be5e3 Mon Sep 17 00:00:00 2001 From: Steve Lasker Date: Fri, 6 Dec 2024 08:26:49 -0800 Subject: [PATCH 8/8] Update draft-ietf-cose-hash-envelope.md Co-authored-by: Orie Steele --- draft-ietf-cose-hash-envelope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draft-ietf-cose-hash-envelope.md b/draft-ietf-cose-hash-envelope.md index 93fdc45..fcc4bfd 100644 --- a/draft-ietf-cose-hash-envelope.md +++ b/draft-ietf-cose-hash-envelope.md @@ -94,7 +94,7 @@ TBD_3: Hash_Envelope_Protected_Header = { ? &(alg: 1) => int, ? &(typ: 16) => uint / tstr - &(payload_hash_alg: TBD_1) => uint + &(payload_hash_alg: TBD_1) => int &(payload_preimage_content_type: TBD_2) => uint / tstr ? &(payload_location: TBD_3) => tstr * int / tstr => any