Skip to content

Commit

Permalink
Script updating gh-pages from f880364. [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
ID Bot committed Oct 21, 2024
1 parent 31de61b commit a2edb05
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 4 deletions.
89 changes: 88 additions & 1 deletion draft-ietf-mls-extensions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,9 @@ <h2 id="name-copyright-notice">
</li>
<li class="compact toc ulBare ulEmpty" id="section-toc.1-1.4.2.2.2.5">
<p id="section-toc.1-1.4.2.2.2.5.1"><a href="#section-4.2.5" class="auto internal xref">4.2.5</a>.  <a href="#name-last_resort_key_package-mls" class="internal xref">last_resort_key_package MLS Extension</a></p>
</li>
<li class="compact toc ulBare ulEmpty" id="section-toc.1-1.4.2.2.2.6">
<p id="section-toc.1-1.4.2.2.2.6.1"><a href="#section-4.2.6" class="auto internal xref">4.2.6</a>.  <a href="#name-extension_aad-mls-extension" class="internal xref">extension_aad MLS Extension</a></p>
</li>
</ul>
</li>
Expand Down Expand Up @@ -1302,6 +1305,9 @@ <h2 id="name-copyright-notice">
<p id="section-toc.1-1.4.2.5.2.1.1"><a href="#section-4.5.1" class="auto internal xref">4.5.1</a>.  <a href="#name-labeled-extension-content" class="internal xref">Labeled Extension Content</a></p>
</li>
</ul>
</li>
<li class="compact toc ulBare ulEmpty" id="section-toc.1-1.4.2.6">
<p id="section-toc.1-1.4.2.6.1"><a href="#section-4.6" class="auto internal xref">4.6</a>.  <a href="#name-mls-extension-types-2" class="internal xref">MLS Extension Types</a></p>
</li>
</ul>
</li>
Expand Down Expand Up @@ -1692,7 +1698,8 @@ <h4 id="name-extension-designer-tools">
<p id="section-2.1.7-1">The safe extension API allows extension designers to sign and encrypt payloads
without the need to register their own IANA labels. Following the same pattern,
this document also provides ways for extension designers to define their own
wire formats, proposals and credentials.<a href="#section-2.1.7-1" class="pilcrow"></a></p>
wire formats, proposals, credentials, and for structured data in the
Additional Authenticated Data.<a href="#section-2.1.7-1" class="pilcrow"></a></p>
<div id="wire-formats">
<section id="section-2.1.7.1">
<h5 id="name-wire-formats">
Expand Down Expand Up @@ -1769,6 +1776,43 @@ <h5 id="name-credentials">
Section 5.3 of the MLS specification.<a href="#section-2.1.7.3-3" class="pilcrow"></a></p>
</section>
</div>
<div id="safe-aad">
<section id="section-2.1.7.4">
<h5 id="name-additional-authenticated-da">
<a href="#section-2.1.7.4" class="section-number selfRef">2.1.7.4. </a><a href="#name-additional-authenticated-da" class="section-name selfRef">Additional Authenticated Data (AAD)</a>
</h5>
<p id="section-2.1.7.4-1">The <code>PrivateContentAAD</code> struct in MLS can contain arbitrary additional
application-specific AAD in its <code>authenticated_data</code> field. This framework
defines a framing used to allow multiple extensions to add AAD safely
without conflicts or ambiguity.<a href="#section-2.1.7.4-1" class="pilcrow"></a></p>
<p id="section-2.1.7.4-2">When any AAD safe extension is included in the <code>authenticated_data</code> field,
the "safe" AAD items MUST come before any non-safe data in the
<code>authenticated_data</code> field. Safe AAD items are framed using the <code>SafeAAD</code>
struct and are sorted in increasing numerical order of the <code>ExtensionType</code>
as described below:<a href="#section-2.1.7.4-2" class="pilcrow"></a></p>
<div class="lang-tls sourcecode" id="section-2.1.7.4-3">
<pre>
struct {
ExtensionType extension_type;
opaque aad_item_data&lt;V&gt;;
} SafeAADItem;

struct {
SafeAADItem aad_items&lt;V&gt;;
} SafeAAD;
</pre><a href="#section-2.1.7.4-3" class="pilcrow"></a>
</div>
<p id="section-2.1.7.4-4">If the <code>SafeAAD</code> is present or not is determined by the presence of the
<code>extension_aad</code> GroupContext extension in the <code>required_capabilities</code> of the
group. If <code>extension_aad</code> is present in <code>required_capabilities</code> but no
"safe" AAD items are present, the <code>aad_items</code> is a zero-length vector.<a href="#section-2.1.7.4-4" class="pilcrow"></a></p>
<p id="section-2.1.7.4-5">Each extension which include a <code>SafeAADItem</code> needs to advertise its
<code>ExtensionType</code> in its LeafNode <code>capabilities.extensions</code>. Extensions MAY
require an <code>ExtensionType</code> to be included in <code>required_capabilities</code>, but
members which encounter a <code>SafeAADItem</code> they do not recognize can safely
ignore it.<a href="#section-2.1.7.4-5" class="pilcrow"></a></p>
</section>
</div>
</section>
</div>
<div id="extension-state-anchoring-storage-and-agreement">
Expand Down Expand Up @@ -2744,6 +2788,33 @@ <h4 id="name-last_resort_key_package-mls">
</ul>
</section>
</div>
<div id="extensionaad-mls-extension">
<section id="section-4.2.6">
<h4 id="name-extension_aad-mls-extension">
<a href="#section-4.2.6" class="section-number selfRef">4.2.6. </a><a href="#name-extension_aad-mls-extension" class="section-name selfRef">extension_aad MLS Extension</a>
</h4>
<p id="section-4.2.6-1">The extension_aad MLS Extension Type is used to signal support for <code>SafeAAD</code>
in LeafNode capabilities, and in GroupContext <code>required_capabilities</code>. It contains no additional data.<a href="#section-4.2.6-1" class="pilcrow"></a></p>
<ul class="normal">
<li class="normal" id="section-4.2.6-2.1">
<p id="section-4.2.6-2.1.1">Value: 0x000B<a href="#section-4.2.6-2.1.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4.2.6-2.2">
<p id="section-4.2.6-2.2.1">Name: extension_aad<a href="#section-4.2.6-2.2.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4.2.6-2.3">
<p id="section-4.2.6-2.3.1">Message(s): LN,GC: This extension may appear in LeafNode and GroupContext
objects.<a href="#section-4.2.6-2.3.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4.2.6-2.4">
<p id="section-4.2.6-2.4.1">Recommended: Y<a href="#section-4.2.6-2.4.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-4.2.6-2.5">
<p id="section-4.2.6-2.5.1">Reference: RFC XXXX<a href="#section-4.2.6-2.5.1" class="pilcrow"></a></p>
</li>
</ul>
</section>
</div>
</section>
</div>
<div id="mls-proposal-types">
Expand Down Expand Up @@ -2938,6 +3009,22 @@ <h4 id="name-labeled-extension-content">
</div>
</section>
</div>
<div id="mls-extension-types-1">
<section id="section-4.6">
<h3 id="name-mls-extension-types-2">
<a href="#section-4.6" class="section-number selfRef">4.6. </a><a href="#name-mls-extension-types-2" class="section-name selfRef">MLS Extension Types</a>
</h3>
<p id="section-4.6-1">This document modifies the rules of the "MLS Extension Types" registry
to add a new Message type as follows:<a href="#section-4.6-1" class="pilcrow"></a></p>
<ul class="normal">
<li class="normal" id="section-4.6-2.1">
<p id="section-4.6-2.1.1">AD: Authenticated Additional Data<a href="#section-4.6-2.1.1" class="pilcrow"></a></p>
</li>
</ul>
<p id="section-4.6-3">The <code>AD</code> Message type refers to an <code>ExtensionType</code> used inside the
<code>SafeAADItem</code> structure defined in <a href="#safe-aad" class="auto internal xref">Section 2.1.7.4</a>.<a href="#section-4.6-3" class="pilcrow"></a></p>
</section>
</div>
</section>
</div>
<div id="security-considerations">
Expand Down
68 changes: 66 additions & 2 deletions draft-ietf-mls-extensions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ Table of Contents
4.2.3. accepted_media_types MLS Extension
4.2.4. required_media_types MLS Extension
4.2.5. last_resort_key_package MLS Extension
4.2.6. extension_aad MLS Extension
4.3. MLS Proposal Types
4.3.1. Extension Proposal
4.3.2. Extension Path Proposal
Expand All @@ -108,6 +109,7 @@ Table of Contents
4.4.1. Extension Credential
4.5. MLS Signature Labels
4.5.1. Labeled Extension Content
4.6. MLS Extension Types
5. Security considerations
5.1. AppAck
5.2. Targeted Messages
Expand Down Expand Up @@ -421,8 +423,9 @@ Table of Contents
The safe extension API allows extension designers to sign and encrypt
payloads without the need to register their own IANA labels.
Following the same pattern, this document also provides ways for
extension designers to define their own wire formats, proposals and
credentials.
extension designers to define their own wire formats, proposals,
credentials, and for structured data in the Additional Authenticated
Data.

2.1.7.1. Wire Formats

Expand Down Expand Up @@ -490,6 +493,40 @@ Table of Contents
has to meet the requirements detailed in Section 5.3 of the MLS
specification.

2.1.7.4. Additional Authenticated Data (AAD)

The PrivateContentAAD struct in MLS can contain arbitrary additional
application-specific AAD in its authenticated_data field. This
framework defines a framing used to allow multiple extensions to add
AAD safely without conflicts or ambiguity.

When any AAD safe extension is included in the authenticated_data
field, the "safe" AAD items MUST come before any non-safe data in the
authenticated_data field. Safe AAD items are framed using the
SafeAAD struct and are sorted in increasing numerical order of the
ExtensionType as described below:

struct {
ExtensionType extension_type;
opaque aad_item_data<V>;
} SafeAADItem;

struct {
SafeAADItem aad_items<V>;
} SafeAAD;

If the SafeAAD is present or not is determined by the presence of the
extension_aad GroupContext extension in the required_capabilities of
the group. If extension_aad is present in required_capabilities but
no "safe" AAD items are present, the aad_items is a zero-length
vector.

Each extension which include a SafeAADItem needs to advertise its
ExtensionType in its LeafNode capabilities.extensions. Extensions
MAY require an ExtensionType to be included in required_capabilities,
but members which encounter a SafeAADItem they do not recognize can
safely ignore it.

2.1.8. Extension state: anchoring, storage and agreement

The safe extension framework can help an MLS extension ensure that
Expand Down Expand Up @@ -1291,6 +1328,23 @@ Table of Contents

* Reference: RFC XXXX

4.2.6. extension_aad MLS Extension

The extension_aad MLS Extension Type is used to signal support for
SafeAAD in LeafNode capabilities, and in GroupContext
required_capabilities. It contains no additional data.

* Value: 0x000B

* Name: extension_aad

* Message(s): LN,GC: This extension may appear in LeafNode and
GroupContext objects.

* Recommended: Y

* Reference: RFC XXXX

4.3. MLS Proposal Types

4.3.1. Extension Proposal
Expand Down Expand Up @@ -1385,6 +1439,16 @@ Table of Contents

* Reference: RFC XXXX

4.6. MLS Extension Types

This document modifies the rules of the "MLS Extension Types"
registry to add a new Message type as follows:

* AD: Authenticated Additional Data

The AD Message type refers to an ExtensionType used inside the
SafeAADItem structure defined in Section 2.1.7.4.

5. Security considerations

5.1. AppAck
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2>Preview for branch <a href="fix-upload-ci">fix-upload-ci</a></h2>
<tr>
<td><a href="fix-upload-ci/draft-ietf-mls-extensions.html" class="html draft-ietf-mls-extensions" title="The Messaging Layer Security (MLS) Extensions (HTML)">MLS</a></td>
<td><a href="fix-upload-ci/draft-ietf-mls-extensions.txt" class="txt draft-ietf-mls-extensions" title="The Messaging Layer Security (MLS) Extensions (Text)">plain text</a></td>
<td>same as main</td>
<td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://mlswg.github.io/mls-extensions/draft-ietf-mls-extensions.txt&amp;url_2=https://mlswg.github.io/mls-extensions/fix-upload-ci/draft-ietf-mls-extensions.txt" class="diff draft-ietf-mls-extensions">diff with main</a></td>
</tr>
</table>
<script>
Expand Down

0 comments on commit a2edb05

Please sign in to comment.