From f1edcaa59e929d8e38143891b1abbfc76ccf17e3 Mon Sep 17 00:00:00 2001
From: Wind4Greg <gregb@grotto-networking.com>
Date: Thu, 29 Feb 2024 08:36:04 -0800
Subject: [PATCH 1/3] Put in suggested fixes to allow display of specification
 so can resume editing.

---
 index.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index e701732..862f333 100644
--- a/index.html
+++ b/index.html
@@ -203,7 +203,7 @@
         },
         lint: {"no-unused-dfns": false},
         postProcess: [restrictRefs],
-        xref: [ "i18n-glossary" ]
+        xref: ["INFRA", "VC-DATA-MODEL-2.0", "VC-DATA-INTEGRITY", "i18n-glossary"]
       };
     </script>
         <style>
@@ -302,8 +302,11 @@ <h2>Introduction</h2>
 
       <section id="terminology">
         <h3>Terminology</h3>
-
-        <div data-include="https://w3c.github.io/vc-data-integrity/terms.html"></div>
+        <p>
+Terminology used throughout this document is defined in the
+<a data-cite="VC-DATA-INTEGRITY#terminology">Terminology</a> section of the
+[[[VC-DATA-INTEGRITY]]] specification.
+        </p>
 
       </section>
 

From a5551208d990a92cb0b31457bee8eaa34a8ce573 Mon Sep 17 00:00:00 2001
From: Wind4Greg <gregb@grotto-networking.com>
Date: Thu, 29 Feb 2024 09:56:38 -0800
Subject: [PATCH 2/3] Constrain CBOR encoding to NOT use tags on components.

---
 index.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 862f333..57c3f3f 100644
--- a/index.html
+++ b/index.html
@@ -570,19 +570,20 @@ <h4>serializeBaseProofValue</h4>
 header bytes `0xd9`, `0x5d`, and `0x02`.
             </li>
             <li>
-Initialize `components` to an array with five elements containing the values of:
-`bbsSignature`, `bbsHeader`, `publicKey`, `hmacKey`, and `mandatoryPointers`.
+Initialize |components| to an array with five elements containing the values of:
+|bbsSignature|, |bbsHeader|, |publicKey|, |hmacKey|, and |mandatoryPointers|.
             </li>
             <li>
-CBOR-encode `components` and append it to `proofValue`.
+CBOR-encode |components| per [[RFC8949]] where CBOR tagging MUST NOT be used on
+any of the |components|. Append the produced encoded value to |proofValue|.
             </li>
             <li>
-Initialize `baseProof` to a string with the multibase-base64url-no-pad-encoding
+Initialize |baseProof| to a string with the multibase-base64url-no-pad-encoding
 of `proofValue`. That is, return a string starting with "`u`" and ending with the
-base64url-no-pad-encoded value of `proofValue`.
+base64url-no-pad-encoded value of |proofValue|.
             </li>
             <li>
-Return `baseProof` as <em>base proof</em>.
+Return |baseProof| as <em>base proof</em>.
             </li>
           </ol>
 
@@ -847,16 +848,17 @@ <h4>serializeDerivedProofValue</h4>
 proof header bytes `0xd9`, `0x5d`, and `0x03`.
             </li>
             <li>
-Initialize `components` to an array with five elements containing the values of
-`bbsProof`, `compressedLabelMap`, `mandatoryIndexes`, `selectiveIndexes`, and
-`presentationHeader`.
+Initialize |components| to an array with five elements containing the values of
+|bbsProof|, |compressedLabelMap|, |mandatoryIndexes|, |selectiveIndexes|, and
+|presentationHeader|.
             </li>
             <li>
-CBOR-encode `components` and append it to `proofValue`.
+CBOR-encode |components| per [[RFC8949]] where CBOR tagging MUST NOT be used on
+any of the |components|. Append the produced encoded value to |proofValue|.
             </li>
             <li>
 Return the <em>derived proof</em> as a string with the
-multibase-base64url-no-pad-encoding of `proofValue`. That is, return a string
+multibase-base64url-no-pad-encoding of |proofValue|. That is, return a string
 starting with "`u`" and ending with the base64url-no-pad-encoded value of
 `proofValue`.
             </li>

From 0e6a9447e94f11666d15e4b7d37c616b2da6e81c Mon Sep 17 00:00:00 2001
From: Wind4Greg <gregb@grotto-networking.com>
Date: Thu, 29 Feb 2024 10:11:53 -0800
Subject: [PATCH 3/3] Update test vectors with no CBOR component tagging.

---
 TestVectors/addSignedSDBase.json       | 2 +-
 TestVectors/derivedRevealDocument.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestVectors/addSignedSDBase.json b/TestVectors/addSignedSDBase.json
index 990b3d6..7f3aeff 100644
--- a/TestVectors/addSignedSDBase.json
+++ b/TestVectors/addSignedSDBase.json
@@ -52,6 +52,6 @@
     "created": "2023-08-15T23:36:38Z",
     "verificationMethod": "did:key:zUC7DerdEmfZ8f4pFajXgGwJoMkV1ofMTmEG5UoNvnWiPiLuGKNeqgRpLH2TV4Xe5mJ2cXV76gRN7LFQwapF1VFu6x2yrr5ci1mXqC1WNUrnHnLgvfZfMH7h6xP6qsf9EKRQrPQ#zUC7DerdEmfZ8f4pFajXgGwJoMkV1ofMTmEG5UoNvnWiPiLuGKNeqgRpLH2TV4Xe5mJ2cXV76gRN7LFQwapF1VFu6x2yrr5ci1mXqC1WNUrnHnLgvfZfMH7h6xP6qsf9EKRQrPQ",
     "proofPurpose": "assertionMethod",
-    "proofValue": "u2V0ChdhAWFCGu4Bjdo1LcI-aZYIe5v5Caz1Pb-XCxcml-AyqVz_Ywgy98Xgm_k4aYkBwul8gHZICoPzrVYQuqeYacqeqBIkUN_w19que-L-OwwBMxGyUWNhAWEA6W78l002QsYw1zSNXvmpvQjAelPyeUvd-k7dzxWFL31Vd4F-JiBfjEwG6wYfQw_8rA-LL20rbTVaMF96WH5oY2EBYYKTvGvo9pXVJbxIrm3i4wkdhUxqKCTIGrnxFuAdZwWi6T3omD5wzZ7bAGbRneEEQSxBmXtvnC6Pr59nPv_v3HrAW9wq_uxYzF_NyaX3GPv0h_FV2T2OSao8C6uoyWiqIj9hAWCAAESIzRFVmd4iZqrvM3e7_ABEiM0RVZneImaq7zN3u_4VnL2lzc3VlcngdL2NyZWRlbnRpYWxTdWJqZWN0L3NhaWxOdW1iZXJ4Gi9jcmVkZW50aWFsU3ViamVjdC9zYWlscy8xeCAvY3JlZGVudGlhbFN1YmplY3QvYm9hcmRzLzAveWVhcngaL2NyZWRlbnRpYWxTdWJqZWN0L3NhaWxzLzI"
+    "proofValue": "u2V0ChVhQhruAY3aNS3CPmmWCHub-Qms9T2_lwsXJpfgMqlc_2MIMvfF4Jv5OGmJAcLpfIB2SAqD861WELqnmGnKnqgSJFDf8Nfarnvi_jsMATMRslFhYQDpbvyXTTZCxjDXNI1e-am9CMB6U_J5S936Tt3PFYUvfVV3gX4mIF-MTAbrBh9DD_ysD4svbSttNVowX3pYfmhhYYKTvGvo9pXVJbxIrm3i4wkdhUxqKCTIGrnxFuAdZwWi6T3omD5wzZ7bAGbRneEEQSxBmXtvnC6Pr59nPv_v3HrAW9wq_uxYzF_NyaX3GPv0h_FV2T2OSao8C6uoyWiqIj1ggABEiM0RVZneImaq7zN3u_wARIjNEVWZ3iJmqu8zd7v-FZy9pc3N1ZXJ4HS9jcmVkZW50aWFsU3ViamVjdC9zYWlsTnVtYmVyeBovY3JlZGVudGlhbFN1YmplY3Qvc2FpbHMvMXggL2NyZWRlbnRpYWxTdWJqZWN0L2JvYXJkcy8wL3llYXJ4Gi9jcmVkZW50aWFsU3ViamVjdC9zYWlscy8y"
   }
 }
\ No newline at end of file
diff --git a/TestVectors/derivedRevealDocument.json b/TestVectors/derivedRevealDocument.json
index 9742fc5..5730076 100644
--- a/TestVectors/derivedRevealDocument.json
+++ b/TestVectors/derivedRevealDocument.json
@@ -42,6 +42,6 @@
     "created": "2023-08-15T23:36:38Z",
     "verificationMethod": "did:key:zUC7DerdEmfZ8f4pFajXgGwJoMkV1ofMTmEG5UoNvnWiPiLuGKNeqgRpLH2TV4Xe5mJ2cXV76gRN7LFQwapF1VFu6x2yrr5ci1mXqC1WNUrnHnLgvfZfMH7h6xP6qsf9EKRQrPQ#zUC7DerdEmfZ8f4pFajXgGwJoMkV1ofMTmEG5UoNvnWiPiLuGKNeqgRpLH2TV4Xe5mJ2cXV76gRN7LFQwapF1VFu6x2yrr5ci1mXqC1WNUrnHnLgvfZfMH7h6xP6qsf9EKRQrPQ",
     "proofPurpose": "assertionMethod",
-    "proofValue": "u2V0DhdhAWQIQhbctdLVarnbk-OmGOHNS9tPhPxk4f1k1qfNMWao693iFUB7x26Z1dr0k5tqxscWziRZxESwmmCxEHU81LhvI9UURJ_vaKtJA2aXWkz9FXbdBzD550ygbxbYREYs2NGHytqXs3UI_a3ZxFoCCRmX1DuwfXLryGe6Q5mzqxXUUbRqJNfdwvm0po3awDk45pPp3Vez060KqO6v9bki7I-kQgfCNDSWbQCloPQHCU3i-PGEhOgl3ULjOKjwJFQYaVHQFs85YfR2CmSafrSkQNQmz5TBn97YHjp3GalESGSrt42YubaxYdtlF_QWGP7JJsPygLhCrUXNlDvZl6Sw-py6rqU_KhgzWxjlTjlFW-MvDtNIi96Efg3u552ulTVjBtKyDTvM4o9tL9kW0YiFTyJf0dyVfQOT8x5GTSK5b-QMqn3wIduR6ZmbKnxeGc6x6QbhkSA2OhMZlXNLw4YZt7cRnWQorp2woy0Hz1VguB3O3N5FLg1P-pN-RigIqpaqS9JDws8Lt9KTVU4uNB6olMPEYhj5lTuqqxpwsAgUJwkKUwTvachxzuGELvOfnAw0XEN1RSHMaUCbHQdHangaT0yuQ0Ju1io5KKVoy-yf2VKA8McVubDr7GqPy-iQPUJXzH-i5X4F5vEQIz5ZxPzrsagZAmm8UhqmdmSO-_bJ00-BPb6qb8xbOmixPXhvG2wMVkzI7pgACAQQCAwMHBAYFAI4AAQIFBggJCg4PEBESE4YDBAUICQrYQEQRM3eq"
+    "proofValue": "u2V0DhVkCEIW3LXS1Wq525PjphjhzUvbT4T8ZOH9ZNanzTFmqOvd4hVAe8dumdXa9JObasbHFs4kWcREsJpgsRB1PNS4byPVFESf72irSQNml1pM_RV23Qcw-edMoG8W2ERGLNjRh8ral7N1CP2t2cRaAgkZl9Q7sH1y68hnukOZs6sV1FG0aiTX3cL5tKaN2sA5OOaT6d1Xs9OtCqjur_W5IuyPpEIHwjQ0lm0ApaD0BwlN4vjxhIToJd1C4zio8CRUGGlR0BbPOWH0dgpkmn60pEDUJs-UwZ_e2B46dxmpREhkq7eNmLm2sWHbZRf0Fhj-ySbD8oC4Qq1FzZQ72ZeksPqcuq6lPyoYM1sY5U45RVvjLw7TSIvehH4N7uedrpU1YwbSsg07zOKPbS_ZFtGIhU8iX9HclX0Dk_MeRk0iuW_kDKp98CHbkemZmyp8XhnOsekG4ZEgNjoTGZVzS8OGGbe3EZ1kKK6dsKMtB89VYLgdztzeRS4NT_qTfkYoCKqWqkvSQ8LPC7fSk1VOLjQeqJTDxGIY-ZU7qqsacLAIFCcJClME72nIcc7hhC7zn5wMNFxDdUUhzGlAmx0HR2p4Gk9MrkNCbtYqOSilaMvsn9lSgPDHFbmw6-xqj8vokD1CV8x_ouV-BebxECM-WcT867GoGQJpvFIapnZkjvv2ydNPgT2-qm_MWzposT14bxtsDFZMyO6YAAgEEAgMDBwQGBQCOAAECBQYICQoODxAREhOGAwQFCAkKRBEzd6o"
   }
 }
\ No newline at end of file