Skip to content

Commit

Permalink
Script updating gh-pages from 7cdec91. [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
ID Bot committed Oct 30, 2024
1 parent 64fd509 commit baabc00
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 114 deletions.
179 changes: 108 additions & 71 deletions draft-ietf-cose-hash-envelope.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,45 +165,91 @@
}

@font-face {
font-family: 'Cabin Condensed';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-vietnamese.woff2') format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
}
@font-face {
font-family: 'Cabin Condensed';
font-family: 'Oxygen Mono';
font-style: normal;
font-weight: 600;
font-weight: 400;
font-display: swap;
src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-latin-ext.woff2') format('woff2');
src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin-ext.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Cabin Condensed';
font-family: 'Oxygen Mono';
font-style: normal;
font-weight: 600;
font-weight: 400;
font-display: swap;
src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-latin.woff2') format('woff2');
src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: 'Oxygen Mono';
font-family: 'Sofia Sans Semi Condensed';
font-style: italic;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-cyrillic-ext.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: italic;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-cyrillic.woff2') format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: italic;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-greek.woff2') format('woff2');
unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: italic;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-latin-ext.woff2') format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: italic;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin-ext.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-cyrillic-ext.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
@font-face {
font-family: 'Oxygen Mono';
font-family: 'Sofia Sans Semi Condensed';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-cyrillic.woff2') format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: normal;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-greek.woff2') format('woff2');
unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: normal;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-latin-ext.woff2') format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Sofia Sans Semi Condensed';
font-style: normal;
font-weight: 1 1000;
src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

:root {
Expand All @@ -218,6 +264,7 @@
--pilcrow-strong: #bbb;
--small-font-size: 14.5px;
--font-mono: 'Oxygen Mono', monospace;
--font-title: "Sofia Sans Semi Condensed", sans-serif;
scrollbar-color: #bbb #eee;
}
body {
Expand All @@ -236,8 +283,8 @@

/* headings */
h1, h2, h3, h4, h5, h6 {
font-family: "Cabin Condensed", sans-serif;
font-weight: 600;
font-family: var(--font-title);
font-weight: 680;
margin: 0.8em 0 0.3em;
font-size-adjust: 0.5;
color: var(--title-color);
Expand Down Expand Up @@ -645,6 +692,12 @@
padding: 0.75em 0 2em 0;
margin-bottom: 1em;
}
@media screen {
#toc nav {
font-family: var(--font-title);
font-weight: 360;
}
}
#toc nav ul {
margin: 0 0.5em 0 0;
padding: 0;
Expand Down Expand Up @@ -1032,7 +1085,7 @@
</tr></thead>
<tfoot><tr>
<td class="left">Steele, et al.</td>
<td class="center">Expires 19 April 2025</td>
<td class="center">Expires 3 May 2025</td>
<td class="right">[Page]</td>
</tr></tfoot>
</table>
Expand All @@ -1045,12 +1098,12 @@
<dd class="internet-draft">draft-ietf-cose-hash-envelope-latest</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2024-10-16" class="published">16 October 2024</time>
<time datetime="2024-10-30" class="published">30 October 2024</time>
</dd>
<dt class="label-intended-status">Intended Status:</dt>
<dd class="intended-status">Standards Track</dd>
<dt class="label-expires">Expires:</dt>
<dd class="expires"><time datetime="2025-04-19">19 April 2025</time></dd>
<dd class="expires"><time datetime="2025-05-03">3 May 2025</time></dd>
<dt class="label-authors">Authors:</dt>
<dd class="authors">
<div class="author">
Expand Down Expand Up @@ -1110,7 +1163,7 @@ <h2 id="name-status-of-this-memo">
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow"></a></p>
<p id="section-boilerplate.1-4">
This Internet-Draft will expire on 19 April 2025.<a href="#section-boilerplate.1-4" class="pilcrow"></a></p>
This Internet-Draft will expire on 3 May 2025.<a href="#section-boilerplate.1-4" class="pilcrow"></a></p>
</section>
</div>
<div id="copyright">
Expand Down Expand Up @@ -1280,28 +1333,11 @@ <h2 id="name-hash-envelope-cddl">
<div class="lang-cddl sourcecode" id="section-4-1">
<pre>
Hash_Envelope_Protected_Header = {
; Cryptographic algorithm to use
? &amp;(alg: 1) =&gt; int,

; Type of the envelope
? &amp;(typ: 16) =&gt; int / tstr

; Hash algorithm used to produce the payload from content
; -16 for SHA-256,
; See https://www.iana.org/assignments/cose/cose.xhtml
&amp;(payload_hash_alg: TBD_1) =&gt; int

; Content type of the preimage
; (content to be hashed) of the payload
; 50 for application/json,
; See https://datatracker.ietf.org/doc/html/rfc7252#section-12.3
&amp;(payload_preimage_content_type: TBD_2) =&gt; int

; Location the content of the hashed payload is stored
; For example:
; storage.example/244f...9c19
&amp;(payload_preimage_content_type: TBD_2) =&gt; int / tstr
? &amp;(payload_location: TBD_3) =&gt; tstr

* int / tstr =&gt; any
}

Expand All @@ -1321,19 +1357,22 @@ <h2 id="name-hash-envelope-cddl">
</div>
<ul class="normal">
<li class="normal" id="section-4-2.1">
<p id="section-4-2.1.1">Label <code>16</code> (typ) <span class="bcp14">MAY</span> be used to assign a content format or media type to the entire hash envelope.<a href="#section-4-2.1.1" class="pilcrow"></a></p>
<p id="section-4-2.1.1">Label <code>1</code> (alg) Cryptographic algorithm to use<a href="#section-4-2.1.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4-2.2">
<p id="section-4-2.2.1">Label <code>TBD_1</code> (payload hash alg) <span class="bcp14">MUST</span> be present in the protected header and <span class="bcp14">MUST NOT</span> be present in the unprotected header.<a href="#section-4-2.2.1" class="pilcrow"></a></p>
<p id="section-4-2.2.1">Label <code>16</code> (typ) <span class="bcp14">MAY</span> be used to assign a content format or media type to the entire hash envelope.<a href="#section-4-2.2.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4-2.3">
<p id="section-4-2.3.1">Label <code>TBD_2</code> (content type of the preimage of the payload) <span class="bcp14">MAY</span> be present in the protected header or unprotected header.<a href="#section-4-2.3.1" class="pilcrow"></a></p>
<p id="section-4-2.3.1">Label <code>TBD_1</code> (payload hash alg) <span class="bcp14">MUST</span> be present in the protected header and <span class="bcp14">MUST NOT</span> be present in the unprotected header.<a href="#section-4-2.3.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4-2.4">
<p id="section-4-2.4.1">Label <code>TBD_3</code> (payload_location) <span class="bcp14">MAY</span> be added to the protected header and <span class="bcp14">MUST NOT</span> be presented in the unprotected header.<a href="#section-4-2.4.1" class="pilcrow"></a></p>
<p id="section-4-2.4.1">Label <code>TBD_2</code> (content type of the preimage of the payload) <span class="bcp14">MAY</span> be present in the protected header or unprotected header.<a href="#section-4-2.4.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4-2.5">
<p id="section-4-2.5.1">Label <code>3</code> (content_type) <span class="bcp14">MUST NOT</span> be present in the protected or unprotected headers.<a href="#section-4-2.5.1" class="pilcrow"></a></p>
<p id="section-4-2.5.1">Label <code>TBD_3</code> (payload_location) <span class="bcp14">MAY</span> be added to the protected header and <span class="bcp14">MUST NOT</span> be presented in the unprotected header.<a href="#section-4-2.5.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4-2.6">
<p id="section-4-2.6.1">Label <code>3</code> (content_type) <span class="bcp14">MUST NOT</span> be present in the protected or unprotected headers.<a href="#section-4-2.6.1" class="pilcrow"></a></p>
</li>
</ul>
<p id="section-4-3">Label <code>3</code> is easily confused with label <code>TBD_2</code> payload_preimage_content_type.
Expand All @@ -1349,23 +1388,21 @@ <h2 id="name-envelope-edn">
<p id="section-5-1">A hashed payload functions equivalently to an attached payload, with the benefits of being compact in size and providing the ability to validate the signature.<a href="#section-5-1" class="pilcrow"></a></p>
<div class="lang-cbor-diag sourcecode" id="section-5-2">
<pre>
18( / COSE Sign 1 /
[
&lt;&lt;{
/ alg : ES384 / 1: -35,
/ kid / 4: h'75726e3a...32636573',
/ typ / 16: "application/example+cose"
/ payload_hash_alg /
TBD_1: -16 / sha-256 /
/ payload_preimage_content_type /
TBD_2: 51 / application/json-patch+json /
/ payload_location /
TBD_3 : "https://storage.example/a24f9c19"
}&gt;&gt;
{} / Unprotected /
h'935b5a91...e18a588a', / Payload /
h'15280897...93ef39e5' / Signature /
]
18( / COSE Sign 1 /
[
&lt;&lt;{
1:-35, / alg : ES384 /
4: h'75726e3a...32636573', / kid /
16: "application/example+cose", / typ /
TBD_1: -16 / payload_hash_alg : sha-256 /
/ payload_preimage_content_type /
TBD_2: 51 / "application/json-patch+json" /
TBD_3: "https://blob.example/a24f9c19"/ payload_location /
}&gt;&gt;
{} / Unprotected /
h'935b5a91...e18a588a', / Payload /
h'15280897...93ef39e5' / Signature /
]
)
</pre><a href="#section-5-2" class="pilcrow"></a>
</div>
Expand Down Expand Up @@ -1434,7 +1471,7 @@ <h4 id="name-payload-hash-algorithm">
<p id="section-8.1.1-1.4.1">Value registry: https://www.iana.org/assignments/cose/cose.xhtml#algorithms<a href="#section-8.1.1-1.4.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-8.1.1-1.5">
<p id="section-8.1.1-1.5.1">Description: Hash algorithm used to produce the payload.<a href="#section-8.1.1-1.5.1" class="pilcrow"></a></p>
<p id="section-8.1.1-1.5.1">Description: Hash algorithm used to produce the payload from pre-image content<a href="#section-8.1.1-1.5.1" class="pilcrow"></a></p>
</li>
</ul>
</section>
Expand Down
62 changes: 23 additions & 39 deletions draft-ietf-cose-hash-envelope.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
Network Working Group O. Steele
Internet-Draft Transmute
Intended status: Standards Track S. Lasker
Expires: 19 April 2025 DataTrails
Expires: 3 May 2025 DataTrails
H. Birkholz
Fraunhofer SIT
16 October 2024
30 October 2024


COSE Hash Envelope
Expand Down Expand Up @@ -56,7 +56,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on 19 April 2025.
This Internet-Draft will expire on 3 May 2025.

Copyright Notice

Expand Down Expand Up @@ -147,28 +147,11 @@ Table of Contents
4. Hash Envelope CDDL

Hash_Envelope_Protected_Header = {
; Cryptographic algorithm to use
? &(alg: 1) => int,

; Type of the envelope
? &(typ: 16) => int / tstr

; Hash algorithm used to produce the payload from content
; -16 for SHA-256,
; See https://www.iana.org/assignments/cose/cose.xhtml
&(payload_hash_alg: TBD_1) => int

; Content type of the preimage
; (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

; Location the content of the hashed payload is stored
; For example:
; storage.example/244f...9c19
&(payload_preimage_content_type: TBD_2) => int / tstr
? &(payload_location: TBD_3) => tstr

* int / tstr => any
}

Expand All @@ -185,6 +168,8 @@ Table of Contents

Hash_Envelope = #6.18(Hash_Envelope_as_COSE_Sign1)

* Label 1 (alg) Cryptographic algorithm to use

* Label 16 (typ) MAY be used to assign a content format or media
type to the entire hash envelope.

Expand Down Expand Up @@ -217,23 +202,21 @@ Table of Contents
the benefits of being compact in size and providing the ability to
validate the signature.

18( / COSE Sign 1 /
[
<<{
/ alg : ES384 / 1: -35,
/ kid / 4: h'75726e3a...32636573',
/ typ / 16: "application/example+cose"
/ payload_hash_alg /
TBD_1: -16 / sha-256 /
/ payload_preimage_content_type /
TBD_2: 51 / application/json-patch+json /
/ payload_location /
TBD_3 : "https://storage.example/a24f9c19"
}>>
{} / Unprotected /
h'935b5a91...e18a588a', / Payload /
h'15280897...93ef39e5' / Signature /
]
18( / COSE Sign 1 /
[
<<{
1:-35, / alg : ES384 /
4: h'75726e3a...32636573', / kid /
16: "application/example+cose", / typ /
TBD_1: -16 / payload_hash_alg : sha-256 /
/ payload_preimage_content_type /
TBD_2: 51 / "application/json-patch+json" /
TBD_3: "https://blob.example/a24f9c19"/ payload_location /
}>>
{} / Unprotected /
h'935b5a91...e18a588a', / Payload /
h'15280897...93ef39e5' / Signature /
]
)

In this example, the sha256 hash algorithm (-16) is used to hash the
Expand Down Expand Up @@ -292,7 +275,8 @@ Table of Contents
* Value registry: https://www.iana.org/assignments/cose/
cose.xhtml#algorithms

* Description: Hash algorithm used to produce the payload.
* Description: Hash algorithm used to produce the payload from pre-
image content

8.1.2. Payload Pre-image Content Type

Expand Down
Loading

0 comments on commit baabc00

Please sign in to comment.