Script updating gh-pages from 18d138a. [ci skip]

Author: ID Bot

clarify-verification/draft-davidben-tls-merkle-tree-certs.html

@@ -1914,7 +1914,7 @@ <h4 id="name-evaluating-a-subtree-inclus">
 <p id="section-4.2.1-1">Given a subtree inclusion proof, <code>inclusion_proof</code>, for entry <code>index</code>, with hash <code>entry_hash</code>, of a subtree <code>[start, end)</code>, the subtree inclusion proof can be <em>evaluated</em> to compute the expected subtree hash:<a href="#section-4.2.1-1" class="pilcrow">¶</a></p>
 <ol start="1" type="1" class="normal type-1" id="section-4.2.1-2">
 <li id="section-4.2.1-2.1">
-              <p id="section-4.2.1-2.1.1">Check <code>start &lt;= index &lt; end</code>. If this does not hold, fail proof evaluation.<a href="#section-4.2.1-2.1.1" class="pilcrow">¶</a></p>
+              <p id="section-4.2.1-2.1.1">Check that <code>[start, end)</code> is a valid subtree (<a href="#definition-of-a-subtree" class="auto internal xref">Section 4.1</a>), and that <code>start &lt;= index &lt; end</code>. If either do not hold, fail proof evaluation.<a href="#section-4.2.1-2.1.1" class="pilcrow">¶</a></p>
 </li>
             <li id="section-4.2.1-2.2">
               <p id="section-4.2.1-2.2.1">Set <code>fn</code> to <code>index - start</code> and <code>sn</code> to <code>end - start - 1</code>.<a href="#section-4.2.1-2.2.1" class="pilcrow">¶</a></p>
@@ -3387,30 +3387,27 @@ <h3 id="name-verifying-certificate-signa">
             <p id="section-7.2-2.3.1">Let <code>index</code> be the certificate's serial number. If <code>index</code> is contained in one of the relying party's revoked ranges (<a href="#revocation-by-index" class="auto internal xref">Section 7.5</a>), abort this process and fail verification.<a href="#section-7.2-2.3.1" class="pilcrow">¶</a></p>
 </li>
           <li id="section-7.2-2.4">
-            <p id="section-7.2-2.4.1">Check the MTCProof's <code>start</code> and <code>end</code> describe a subtree per <a href="#definition-of-a-subtree" class="auto internal xref">Section 4.1</a>. If not, abort this process and fail verification.<a href="#section-7.2-2.4.1" class="pilcrow">¶</a></p>
+            <p id="section-7.2-2.4.1">Construct a TBSCertificateLogEntry as follows:<a href="#section-7.2-2.4.1" class="pilcrow">¶</a></p>
+<ol start="1" type="1" class="normal type-1" id="section-7.2-2.4.2">
+<li id="section-7.2-2.4.2.1">
+                <p id="section-7.2-2.4.2.1.1">Copy the <code>version</code>, <code>issuer</code>, <code>validity</code>, <code>subject</code>, <code>issuerUniqueID</code>, <code>subjectUniqueID</code>, and <code>extensions</code> fields from the TBSCertificate.<a href="#section-7.2-2.4.2.1.1" class="pilcrow">¶</a></p>
 </li>
-          <li id="section-7.2-2.5">
-            <p id="section-7.2-2.5.1">Construct a TBSCertificateLogEntry as follows:<a href="#section-7.2-2.5.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal type-1" id="section-7.2-2.5.2">
-<li id="section-7.2-2.5.2.1">
-                <p id="section-7.2-2.5.2.1.1">Copy the <code>version</code>, <code>issuer</code>, <code>validity</code>, <code>subject</code>, <code>issuerUniqueID</code>, <code>subjectUniqueID</code>, and <code>extensions</code> fields from the TBSCertificate.<a href="#section-7.2-2.5.2.1.1" class="pilcrow">¶</a></p>
-</li>
-              <li id="section-7.2-2.5.2.2">
-                <p id="section-7.2-2.5.2.2.1">Set <code>subjectPublicKeyInfoHash</code> to the hash of the DER encoding of <code>subjectPublicKeyInfo</code>.<a href="#section-7.2-2.5.2.2.1" class="pilcrow">¶</a></p>
+              <li id="section-7.2-2.4.2.2">
+                <p id="section-7.2-2.4.2.2.1">Set <code>subjectPublicKeyInfoHash</code> to the hash of the DER encoding of <code>subjectPublicKeyInfo</code>.<a href="#section-7.2-2.4.2.2.1" class="pilcrow">¶</a></p>
 </li>
             </ol>
+</li>
+          <li id="section-7.2-2.5">
+            <p id="section-7.2-2.5.1">Construct a MerkleTreeCertEntry of type <code>tbs_cert_entry</code> with contents the TBSCertificateLogEntry. Let <code>entry_hash</code> be the hash of the entry, <code>MTH({entry}) = HASH(0x00 || entry)</code>, as defined in <span><a href="https://rfc-editor.org/rfc/rfc9162#section-2.1.1" class="relref">Section 2.1.1</a> of [<a href="#RFC9162" class="cite xref">RFC9162</a>]</span>.<a href="#section-7.2-2.5.1" class="pilcrow">¶</a></p>
 </li>
           <li id="section-7.2-2.6">
-            <p id="section-7.2-2.6.1">Construct a MerkleTreeCertEntry of type <code>tbs_cert_entry</code> with contents the TBSCertificateLogEntry. Let <code>entry_hash</code> be the hash of the entry, <code>MTH({entry}) = HASH(0x00 || entry)</code>, as defined in <span><a href="https://rfc-editor.org/rfc/rfc9162#section-2.1.1" class="relref">Section 2.1.1</a> of [<a href="#RFC9162" class="cite xref">RFC9162</a>]</span>.<a href="#section-7.2-2.6.1" class="pilcrow">¶</a></p>
+            <p id="section-7.2-2.6.1">Let <code>expected_subtree_hash</code> be the result of evaluating the MTCProof's <code>inclusion_proof</code> for entry <code>index</code>, with hash <code>entry_hash</code>, of a subtree <code>[start, end)</code>, as described in <a href="#evaluating-a-subtree-inclusion-proof" class="auto internal xref">Section 4.2.1</a>. If evaluation fails, abort this process and fail verification.<a href="#section-7.2-2.6.1" class="pilcrow">¶</a></p>
 </li>
           <li id="section-7.2-2.7">
-            <p id="section-7.2-2.7.1">Let <code>expected_subtree_hash</code> be the result of evaluating the MTCProof's <code>inclusion_proof</code> for entry <code>index</code>, with hash <code>entry_hash</code>, of a subtree <code>[start, end)</code>, as described in <a href="#evaluating-a-subtree-inclusion-proof" class="auto internal xref">Section 4.2.1</a>. If evaluation fails, abort this process and fail verification.<a href="#section-7.2-2.7.1" class="pilcrow">¶</a></p>
+            <p id="section-7.2-2.7.1">If <code>[start, end)</code> matches a trusted subtree (<a href="#trusted-subtrees" class="auto internal xref">Section 7.4</a>), check that <code>expected_subtree_hash</code> is equal to the trusted subtree's hash. Return success if it matches and failure if it does not.<a href="#section-7.2-2.7.1" class="pilcrow">¶</a></p>
 </li>
           <li id="section-7.2-2.8">
-            <p id="section-7.2-2.8.1">If <code>[start, end)</code> matches a trusted subtree (<a href="#trusted-subtrees" class="auto internal xref">Section 7.4</a>), check that <code>expected_subtree_hash</code> is equal to the trusted subtree's hash. Return success if it matches and failure if it does not.<a href="#section-7.2-2.8.1" class="pilcrow">¶</a></p>
-</li>
-          <li id="section-7.2-2.9">
-            <p id="section-7.2-2.9.1">Otherwise, check that the MTCProof's <code>signatures</code> contain a sufficient set of valid signatures from cosigners to satisfy the relying party's cosigner requirements (<a href="#trusted-cosigners" class="auto internal xref">Section 7.3</a>). Unrecognized cosigners MUST be ignored. Signatures are verified as described in <a href="#signature-format" class="auto internal xref">Section 5.4.1</a>. The <code>hash</code> field of the MTCSubtree is set to <code>expected_subtree_hash</code>.<a href="#section-7.2-2.9.1" class="pilcrow">¶</a></p>
+            <p id="section-7.2-2.8.1">Otherwise, check that the MTCProof's <code>signatures</code> contain a sufficient set of valid signatures from cosigners to satisfy the relying party's cosigner requirements (<a href="#trusted-cosigners" class="auto internal xref">Section 7.3</a>). Unrecognized cosigners MUST be ignored. Signatures are verified as described in <a href="#signature-format" class="auto internal xref">Section 5.4.1</a>. The <code>hash</code> field of the MTCSubtree is set to <code>expected_subtree_hash</code>.<a href="#section-7.2-2.8.1" class="pilcrow">¶</a></p>
 </li>
         </ol>
 <p id="section-7.2-3">This procedure only replaces the signature verification portion of X.509 path validation. The relying party MUST continue to perform other checks, such as checking expiry.<a href="#section-7.2-3" class="pilcrow">¶</a></p>
@@ -4328,6 +4325,9 @@ <h3 id="name-since-draft-davidben-tls-merkle-tr">
 <ul class="normal">
 <li class="normal" id="appendix-D.8-1.1">
             <p id="appendix-D.8-1.1.1">Clarify landmark zero<a href="#appendix-D.8-1.1.1" class="pilcrow">¶</a></p>
+</li>
+          <li class="normal" id="appendix-D.8-1.2">
+            <p id="appendix-D.8-1.2.1">Clarify signature verification process<a href="#appendix-D.8-1.2.1" class="pilcrow">¶</a></p>
 </li>
         </ul>
 </section>

clarify-verification/draft-davidben-tls-merkle-tree-certs.txt

@@ -517,7 +517,8 @@ Table of Contents
    inclusion proof can be _evaluated_ to compute the expected subtree
    hash:
 
-   1.  Check start <= index < end.  If this does not hold, fail proof
+   1.  Check that [start, end) is a valid subtree (Section 4.1), and
+       that start <= index < end.  If either do not hold, fail proof
        evaluation.
 
    2.  Set fn to index - start and sn to end - start - 1.
@@ -1656,10 +1657,7 @@ Table of Contents
        contained in one of the relying party's revoked ranges
        (Section 7.5), abort this process and fail verification.
 
-   4.  Check the MTCProof's start and end describe a subtree per
-       Section 4.1.  If not, abort this process and fail verification.
-
-   5.  Construct a TBSCertificateLogEntry as follows:
+   4.  Construct a TBSCertificateLogEntry as follows:
 
        1.  Copy the version, issuer, validity, subject, issuerUniqueID,
            subjectUniqueID, and extensions fields from the
@@ -1668,21 +1666,21 @@ Table of Contents
        2.  Set subjectPublicKeyInfoHash to the hash of the DER encoding
            of subjectPublicKeyInfo.
 
-   6.  Construct a MerkleTreeCertEntry of type tbs_cert_entry with
+   5.  Construct a MerkleTreeCertEntry of type tbs_cert_entry with
        contents the TBSCertificateLogEntry.  Let entry_hash be the hash
        of the entry, MTH({entry}) = HASH(0x00 || entry), as defined in
        Section 2.1.1 of [RFC9162].
 
-   7.  Let expected_subtree_hash be the result of evaluating the
+   6.  Let expected_subtree_hash be the result of evaluating the
        MTCProof's inclusion_proof for entry index, with hash entry_hash,
        of a subtree [start, end), as described in Section 4.2.1.  If
        evaluation fails, abort this process and fail verification.
 
-   8.  If [start, end) matches a trusted subtree (Section 7.4), check
+   7.  If [start, end) matches a trusted subtree (Section 7.4), check
        that expected_subtree_hash is equal to the trusted subtree's
        hash.  Return success if it matches and failure if it does not.
 
-   9.  Otherwise, check that the MTCProof's signatures contain a
+   8.  Otherwise, check that the MTCProof's signatures contain a
        sufficient set of valid signatures from cosigners to satisfy the
        relying party's cosigner requirements (Section 7.3).
        Unrecognized cosigners MUST be ignored.  Signatures are verified
@@ -2941,6 +2939,8 @@ Since draft-davidben-tls-merkle-tree-certs-07
 
    *  Clarify landmark zero
 
+   *  Clarify signature verification process
+
 Authors' Addresses
 
    David Benjamin