Merge pull request #2216 from w3c/issue-2210-compound-attStmtTemplate

SHA: 3bc8301
Reason: push, by agl

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

index.html

@@ -6,7 +6,7 @@
   <meta content="ED" name="w3c-status">
   <meta content="Bikeshed version ac5ea272d, updated Fri Dec 6 15:45:15 2024 -0800" name="generator">
   <link href="https://www.w3.org/TR/webauthn-3/" rel="canonical">
-  <meta content="81077df3d88c2b5762bb7c917cbc9db9d3cda7a2" name="revision">
+  <meta content="3bc830109a1092de107fefc557b33f182e358775" name="revision">
   <meta content="dark light" name="color-scheme">
 <style type="text/css">
 body {
@@ -6094,7 +6094,7 @@ <h4 class="heading settled" data-level="6.5.2" id="sctn-attestation-formats"><sp
     <li data-md>
      <p><strong>Supported <a data-link-type="dfn" href="#attestation-type" id="ref-for-attestation-type⑦">attestation types</a>:</strong></p>
     <li data-md>
-     <p><strong>Syntax:</strong> The syntax of an <a data-link-type="dfn" href="#attestation-statement" id="ref-for-attestation-statement②⑥">attestation statement</a> produced in this format, defined using CDDL <a data-link-type="biblio" href="#biblio-rfc8610" title="Concise Data Definition Language (CDDL): A Notational Convention to Express Concise Binary Object Representation (CBOR) and JSON Data Structures">[RFC8610]</a> for the extension point <code>$attStmtFormat</code> defined in <a href="#sctn-generating-an-attestation-object">§ 6.5.4 Generating an Attestation Object</a>.</p>
+     <p><strong>Syntax:</strong> The syntax of an <a data-link-type="dfn" href="#attestation-statement" id="ref-for-attestation-statement②⑥">attestation statement</a> produced in this format, defined using CDDL <a data-link-type="biblio" href="#biblio-rfc8610" title="Concise Data Definition Language (CDDL): A Notational Convention to Express Concise Binary Object Representation (CBOR) and JSON Data Structures">[RFC8610]</a> for the extension point <code>$$attStmtType</code> defined in <a href="#sctn-generating-an-attestation-object">§ 6.5.4 Generating an Attestation Object</a>.</p>
     <li data-md>
      <p><dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport id="signing-procedure">Signing procedure</dfn>:
 The <a data-link-type="dfn" href="#signing-procedure" id="ref-for-signing-procedure②">signing procedure</a> for computing an <a data-link-type="dfn" href="#attestation-statement" id="ref-for-attestation-statement②⑦">attestation statement</a> in this <a data-link-type="dfn" href="#attestation-statement-format" id="ref-for-attestation-statement-format①②">format</a> given
@@ -6184,17 +6184,21 @@ <h4 class="heading settled" data-level="6.5.4" id="sctn-generating-an-attestatio
      <p>Return the <a data-link-type="dfn" href="#attestation-object" id="ref-for-attestation-object①⑤">attestation object</a> as a CBOR map with the following syntax, filled in with variables initialized by this
 algorithm:</p>
 <pre>attObj = {
-            authData: bytes,
-            $$attStmtType
-         }
+    authData: bytes,
 
-attStmtTemplate = (
-                      fmt: text,
-                      attStmt: { * tstr => any } ; Map is filled in by each concrete attStmtType
-                  )
+    ; Each choice in $$attStmtType defines the fmt value and attStmt structure
+    $$attStmtType
+} .within attStmtTemplate
 
-; Every attestation statement format must have the above fields
-attStmtTemplate .within $$attStmtType
+attStmtTemplate = {
+    authData: bytes,
+    fmt: text,
+    attStmt: (
+      { * tstr => any } ; Map is filled in by each concrete attStmtType
+      //
+      [ * any ]         ; attStmt may also be an array
+    )
+}
 </pre>
    </ol>
    <h4 class="heading settled" data-level="6.5.5" id="sctn-signature-attestation-types"><span class="secno">6.5.5. </span><span class="content">Signature Formats for Packed Attestation, FIDO U2F Attestation, and Assertion Signatures</span><a class="self-link" href="#sctn-signature-attestation-types"></a></h4>
@@ -7198,7 +7202,7 @@ <h3 class="heading settled" data-level="8.9" id="sctn-compound-attestation"><spa
                       attStmt: [2* nonCompoundAttStmt]
                   )
 
-nonCompoundAttStmt = { $$attStmtType } .within { fmt: text .ne "compound" }
+nonCompoundAttStmt = { $$attStmtType } .within { fmt: text .ne "compound", * any => any }
 </pre>
     <dt data-md>Signing procedure
     <dd data-md>