From b8cf60ec6571b7ef995dac8030ad99bfc1a18184 Mon Sep 17 00:00:00 2001 From: ID Bot Date: Tue, 12 Dec 2023 01:31:32 +0000 Subject: [PATCH] Script updating gh-pages from 51cbad0. [ci skip] --- draft-ietf-rats-eat.html | 12 +- draft-ietf-rats-eat.txt | 13 +- draft-ietf-rats-eat.xml | 2252 +++++++++++++++++++------------------- 3 files changed, 1141 insertions(+), 1136 deletions(-) diff --git a/draft-ietf-rats-eat.html b/draft-ietf-rats-eat.html index 03c57262..28ae9db4 100644 --- a/draft-ietf-rats-eat.html +++ b/draft-ietf-rats-eat.html @@ -3414,8 +3414,9 @@

time-int is identical to the epoch-based time, but disallows floating-point representation.

-

The OID encoding from [RFC9090] is used without the tag number in CBOR-encoded tokens. -In JSON tokens OIDs are a text string in the common form of "nn.nn.nn...".

+

For CBOR-encoded tokens, OIDs are specified by "oid" in [RFC9090]. +They are encoded without the tag number. +For CBOR-encoded tokens, OIDs are a text string in the common form of "nn.nn.nn...".

Unless expliclity indicated, URIs are not the URI tag defined in [RFC8949]. They are just text strings that contain a URI conforming to the format defined in [RFC3986].

@@ -3462,7 +3463,7 @@

oid -- MUST be encoded as a string using the well established dotted-decimal notation (e.g., the text "1.2.250.1") [RFC2252].

-

The CDDL generic "JC< >" is used in most places where there is a variance between CBOR and JSON. +

The CDDL generic "JC<>" is used in most places where there is a variance between CBOR and JSON. The first argument is the CDDL for JSON and the second is CDDL for CBOR.

@@ -3472,7 +3473,7 @@

7.2.3. Labels

Most map labels, Claims-Keys, Claim-Names and enumerated-type values are integers for CBOR-encoded tokens and strings for JSON-encoded tokens. -When this is the case the "JC < >" CDDL construct is used to give both the integer and string values.

+When this is the case the "JC<>" CDDL construct is used to give both the integer and string values.

@@ -3499,7 +3500,8 @@

This CDDL defines all the EAT Claims that are added to the main definition of a Claim-Set in Appendix D. Claims-Set is the payload for CWT, JWT and potentially other token types. This is for both CBOR and JSON. -When there is variation between CBOR and JSON, the JC<> CDDL generic defined in Appendix D.

+When there is variation between CBOR and JSON, the JC<> CDDL generic defined in Appendix D. +Note that the JC<> generic uses the CDDL ".feature" control operator defined in [RFC9165].

This CDDL uses, but doesn't define Submodule or nested tokens because the definition for these types varies between CBOR and JSON and the JC<> generic can't be used to define it. The submodule claim is the one place where a CBOR token can be nested inside a JSON token and vice versa. Encoding-specific definitions are provided in the following sections.

diff --git a/draft-ietf-rats-eat.txt b/draft-ietf-rats-eat.txt index 10a53929..79e11e0a 100644 --- a/draft-ietf-rats-eat.txt +++ b/draft-ietf-rats-eat.txt @@ -2184,9 +2184,9 @@ Table of Contents time-int is identical to the epoch-based time, but disallows floating-point representation. - The OID encoding from [RFC9090] is used without the tag number in - CBOR-encoded tokens. In JSON tokens OIDs are a text string in the - common form of "nn.nn.nn...". + For CBOR-encoded tokens, OIDs are specified by "oid" in [RFC9090]. + They are encoded without the tag number. For CBOR-encoded tokens, + OIDs are a text string in the common form of "nn.nn.nn...". Unless expliclity indicated, URIs are not the URI tag defined in [RFC8949]. They are just text strings that contain a URI conforming @@ -2224,7 +2224,7 @@ Table of Contents * oid -- MUST be encoded as a string using the well established dotted-decimal notation (e.g., the text "1.2.250.1") [RFC2252]. - The CDDL generic "JC< >" is used in most places where there is a + The CDDL generic "JC<>" is used in most places where there is a variance between CBOR and JSON. The first argument is the CDDL for JSON and the second is CDDL for CBOR. @@ -2232,7 +2232,7 @@ Table of Contents Most map labels, Claims-Keys, Claim-Names and enumerated-type values are integers for CBOR-encoded tokens and strings for JSON-encoded - tokens. When this is the case the "JC < >" CDDL construct is used to + tokens. When this is the case the "JC<>" CDDL construct is used to give both the integer and string values. 7.2.4. CBOR Interoperability @@ -2248,7 +2248,8 @@ Table of Contents definition of a Claim-Set in Appendix D. Claims-Set is the payload for CWT, JWT and potentially other token types. This is for both CBOR and JSON. When there is variation between CBOR and JSON, the - JC<> CDDL generic defined in Appendix D. + JC<> CDDL generic defined in Appendix D. Note that the JC<> generic + uses the CDDL ".feature" control operator defined in [RFC9165]. This CDDL uses, but doesn't define Submodule or nested tokens because the definition for these types varies between CBOR and JSON and the diff --git a/draft-ietf-rats-eat.xml b/draft-ietf-rats-eat.xml index 092d7f7e..f1d60222 100644 --- a/draft-ietf-rats-eat.xml +++ b/draft-ietf-rats-eat.xml @@ -1538,8 +1538,9 @@ The CDDL definition of Claims-Set here is applicable to EAT, CWT and JWT. Common Data Types time-int is identical to the epoch-based time, but disallows floating-point representation. - The OID encoding from is used without the tag number in CBOR-encoded tokens. -In JSON tokens OIDs are a text string in the common form of "nn.nn.nn...". + For CBOR-encoded tokens, OIDs are specified by "oid" in . +They are encoded without the tag number. +For CBOR-encoded tokens, OIDs are a text string in the common form of "nn.nn.nn...". Unless expliclity indicated, URIs are not the URI tag defined in . They are just text strings that contain a URI conforming to the format defined in . oid -- MUST be encoded as a string using the well established dotted-decimal notation (e.g., the text "1.2.250.1") . - The CDDL generic "JC< >" is used in most places where there is a variance between CBOR and JSON. + The CDDL generic "JC<>" is used in most places where there is a variance between CBOR and JSON. The first argument is the CDDL for JSON and the second is CDDL for CBOR.
Labels Most map labels, Claims-Keys, Claim-Names and enumerated-type values are integers for CBOR-encoded tokens and strings for JSON-encoded tokens. -When this is the case the "JC < >" CDDL construct is used to give both the integer and string values. +When this is the case the "JC<>" CDDL construct is used to give both the integer and string values.
CBOR Interoperability @@ -1601,7 +1602,8 @@ This is addressed in . This CDDL defines all the EAT Claims that are added to the main definition of a Claim-Set in . Claims-Set is the payload for CWT, JWT and potentially other token types. This is for both CBOR and JSON. -When there is variation between CBOR and JSON, the JC<> CDDL generic defined in . +When there is variation between CBOR and JSON, the JC<> CDDL generic defined in . +Note that the JC<> generic uses the CDDL ".feature" control operator defined in . This CDDL uses, but doesn't define Submodule or nested tokens because the definition for these types varies between CBOR and JSON and the JC<> generic can't be used to define it. The submodule claim is the one place where a CBOR token can be nested inside a JSON token and vice versa. Encoding-specific definitions are provided in the following sections. @@ -3280,7 +3282,7 @@ specification reference. - +
Examples @@ -4335,7 +4337,7 @@ differences. A comprehensive history is available via the IETF Datatracker's rec
Contributors - + Many thanks to the following contributors to draft versions of this document: @@ -4386,1124 +4388,1124 @@ document: