From 4fcf000fab17d8ff571323a50d547e216d6778c0 Mon Sep 17 00:00:00 2001
From: ID Bot <idbot@example.com>
Date: Tue, 15 Oct 2024 16:34:00 +0000
Subject: [PATCH] Script updating gh-pages from 30d1fa3. [ci skip]

---
 index.html                                    |  18 +-
 .../draft-bradleylundberg-cfrg-arkg.html      | 209 +++++++++++++++---
 .../draft-bradleylundberg-cfrg-arkg.txt       | 134 +++++++++--
 .../index.html                                |   6 +-
 4 files changed, 306 insertions(+), 61 deletions(-)
 rename {arkg-cose-algs => restore-cose-algs}/draft-bradleylundberg-cfrg-arkg.html (92%)
 rename {arkg-cose-algs => restore-cose-algs}/draft-bradleylundberg-cfrg-arkg.txt (94%)
 rename {arkg-cose-algs => restore-cose-algs}/index.html (87%)

diff --git a/index.html b/index.html
index 8ed2f87..77348e4 100644
--- a/index.html
+++ b/index.html
@@ -17,26 +17,26 @@ <h1>Editor's drafts for main branch of <a href="https://github.com/Yubico/arkg-r
     <p>View <a href="issues.html">saved issues</a>, or the latest GitHub <a href="https://github.com/Yubico/arkg-rfc/issues">issues</a> and <a href="https://github.com/Yubico/arkg-rfc/pulls">pull requests</a> in the <a href="https://github.com/Yubico/arkg-rfc">repo</a>.</p>
     <table id="branch-main">
       <tr>
-        <td><a href="./draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (HTML)">TBD</a></td>
-        <td><a href="./draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (Text)">plain text</a></td>
+        <td><a href="./draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (HTML)">ARKG</a></td>
+        <td><a href="./draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (Text)">plain text</a></td>
         <td><a href="https://datatracker.ietf.org/doc/draft-bradleylundberg-cfrg-arkg" class="dt draft-bradleylundberg-cfrg-arkg" title="Datatracker for draft-bradleylundberg-cfrg-arkg">datatracker</a></td>
         <td><a href="https://author-tools.ietf.org/api/iddiff?doc_1=draft-bradleylundberg-cfrg-arkg&amp;url_2=https://Yubico.github.io/arkg-rfc/draft-bradleylundberg-cfrg-arkg.txt" class="diff draft-bradleylundberg-cfrg-arkg">diff with last submission</a></td>
         <td></td>
       </tr>
     </table>
-    <h2>Preview for branch <a href="arkg-cose-algs">arkg-cose-algs</a></h2>
-    <table id="branch-arkg-cose-algs">
+    <h2>Preview for branch <a href="restore-cose-algs">restore-cose-algs</a></h2>
+    <table id="branch-restore-cose-algs">
       <tr>
-        <td><a href="arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (HTML)">TBD</a></td>
-        <td><a href="arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (Text)">plain text</a></td>
-        <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://Yubico.github.io/arkg-rfc/draft-bradleylundberg-cfrg-arkg.txt&amp;url_2=https://Yubico.github.io/arkg-rfc/arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.txt" class="diff draft-bradleylundberg-cfrg-arkg">diff with main</a></td>
+        <td><a href="restore-cose-algs/draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (HTML)">ARKG</a></td>
+        <td><a href="restore-cose-algs/draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (Text)">plain text</a></td>
+        <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://Yubico.github.io/arkg-rfc/draft-bradleylundberg-cfrg-arkg.txt&amp;url_2=https://Yubico.github.io/arkg-rfc/restore-cose-algs/draft-bradleylundberg-cfrg-arkg.txt" class="diff draft-bradleylundberg-cfrg-arkg">diff with main</a></td>
       </tr>
     </table>
     <h2>Preview for branch <a href="cose-two-party-sign-algs">cose-two-party-sign-algs</a></h2>
     <table id="branch-cose-two-party-sign-algs">
       <tr>
-        <td><a href="cose-two-party-sign-algs/draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (HTML)">TBD</a></td>
-        <td><a href="cose-two-party-sign-algs/draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="TEMPORARY: COSE algorithms for two-party signing (Text)">plain text</a></td>
+        <td><a href="cose-two-party-sign-algs/draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (HTML)">ARKG</a></td>
+        <td><a href="cose-two-party-sign-algs/draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (Text)">plain text</a></td>
         <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://Yubico.github.io/arkg-rfc/draft-bradleylundberg-cfrg-arkg.txt&amp;url_2=https://Yubico.github.io/arkg-rfc/cose-two-party-sign-algs/draft-bradleylundberg-cfrg-arkg.txt" class="diff draft-bradleylundberg-cfrg-arkg">diff with main</a></td>
       </tr>
     </table>
diff --git a/arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.html b/restore-cose-algs/draft-bradleylundberg-cfrg-arkg.html
similarity index 92%
rename from arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.html
rename to restore-cose-algs/draft-bradleylundberg-cfrg-arkg.html
index 075b018..b8ff71a 100644
--- a/arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.html
+++ b/restore-cose-algs/draft-bradleylundberg-cfrg-arkg.html
@@ -20,18 +20,18 @@
 and an initial set of fully specified concrete ARKG instances.
 We expect that additional instances will be defined in the future. 
     " name="description">
-<meta content="xml2rfc 3.23.0" name="generator">
+<meta content="xml2rfc 3.23.2" name="generator">
 <meta content="KDF" name="keyword">
 <meta content="draft-bradleylundberg-cfrg-arkg-latest" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.23.0
-    Python 3.12.3
+  xml2rfc 3.23.2
+    Python 3.12.7
     ConfigArgParse 1.7
-    google-i18n-address 3.1.0
+    google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.4
     lxml 4.9.4
-    platformdirs 4.2.2
+    platformdirs 4.3.6
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.32.3
@@ -1035,11 +1035,11 @@
 <thead><tr>
 <td class="left">Internet-Draft</td>
 <td class="center">ARKG</td>
-<td class="right">September 2024</td>
+<td class="right">October 2024</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">Lundberg &amp; Bradley</td>
-<td class="center">Expires 15 March 2025</td>
+<td class="center">Expires 18 April 2025</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -1052,12 +1052,12 @@
 <dd class="internet-draft">draft-bradleylundberg-cfrg-arkg-latest</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-09-11" class="published">11 September 2024</time>
+<time datetime="2024-10-15" class="published">15 October 2024</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Informational</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2025-03-15">15 March 2025</time></dd>
+<dd class="expires"><time datetime="2025-04-18">18 April 2025</time></dd>
 <dt class="label-authors">Authors:</dt>
 <dd class="authors">
 <div class="author">
@@ -1116,7 +1116,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 15 March 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on 18 April 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
@@ -1252,6 +1252,9 @@ <h2 id="name-copyright-notice">
 </li>
               <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.8.2.2">
                 <p id="section-toc.1-1.8.2.2.1"><a href="#section-8.2" class="auto internal xref">8.2</a>.  <a href="#name-cose-key-type-parameters-re" class="internal xref">COSE Key Type Parameters Registrations</a></p>
+</li>
+              <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.8.2.3">
+                <p id="section-toc.1-1.8.2.3.1"><a href="#section-8.3" class="auto internal xref">8.3</a>.  <a href="#name-cose-algorithms-registratio" class="internal xref">COSE Algorithms Registrations</a></p>
 </li>
             </ul>
 </li>
@@ -1806,7 +1809,7 @@ <h3 id="name-using-hmac-to-adapt-a-kem-w">
         PRK: prk
         info: 'ARKG-KEM-HMAC-mac.' || DST_ext || info
         L: L
-    t = HMAC-Hash-128(K=mk, text=info_sub)
+    t = HMAC-Hash-128(K=mk, text=c')
 
     k = HKDF-Expand with the arguments:
         Hash: Hash
@@ -1834,7 +1837,7 @@ <h3 id="name-using-hmac-to-adapt-a-kem-w">
         info: 'ARKG-KEM-HMAC-mac.' || DST_ext || info
         L: L
 
-    t' = HMAC-Hash-128(K=mk, text=info_sub)
+    t' = HMAC-Hash-128(K=mk, text=c')
     If t = t':
         k = HKDF-Expand with the arguments:
             Hash: Hash
@@ -2393,7 +2396,8 @@ <h3 id="name-cose-key-type-arkg-public-s">
 <p id="section-5.1-1">An ARKG public seed is represented as a COSE_Key structure <span>[<a href="#RFC9052" class="cite xref">RFC9052</a>]</span>
 with <code>kty</code> value TBD (placeholder value -65537).
 This key type defines key type parameters -1 and -2 for the <code>BL</code> and <code>KEM</code> public key, respectively.<a href="#section-5.1-1" class="pilcrow">¶</a></p>
-<p id="section-5.1-2">The <code>alg</code> parameter defines the <code>alg</code> parameter of ARKG derived public keys derived from this ARKG public seed.<a href="#section-5.1-2" class="pilcrow">¶</a></p>
+<p id="section-5.1-2">The <code>alg</code> parameter, when present,
+defines the <code>alg</code> parameter of ARKG derived public keys derived from this ARKG public seed.<a href="#section-5.1-2" class="pilcrow">¶</a></p>
 <p id="section-5.1-3">The following CDDL <span>[<a href="#RFC8610" class="cite xref">RFC8610</a>]</span> example represents an <code>ARKG-P256ADD-ECDH</code> public seed
 restricted to generating derived public keys for use with the ESP256 <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span> signature algorithm:<a href="#section-5.1-3" class="pilcrow">¶</a></p>
 <div class="lang-cddl sourcecode" id="section-5.1-4">
@@ -2428,13 +2432,13 @@ <h3 id="name-cose-key-type-arkg-public-s">
 <p id="section-5.1-5">The following is the same example encoded as CBOR:<a href="#section-5.1-5" class="pilcrow">¶</a></p>
 <div class="alignLeft art-text artwork" id="section-5.1-6">
 <pre>
-h'a50139fbb402582060b6dfddd31659598ae5de49acb220d8704949e84d484b68
-  344340e2565337d2032820a40102200121582069380fc1c3b09652134feefba6
-  1776f97af875ce46ca20252c4165102966ebc52258208b515831462ccb0bd55c
-  ba04bfd50da63faf18bd845433622daf97c06a10d0f121a4010220012158205c
-  099bec31faa581d14e208250d3ffda9ec7f543043008bc84967a8d875b5d7822
-  5820539d57429fcb1c138da29010a155dca14566a8f55ac2f1780810c49d4ed7
-  2d58'
+h'a5013a0001000002582060b6dfddd31659598ae5de49acb220d8704949e84d48
+  4b68344340e2565337d2032820a40102200121582069380fc1c3b09652134fee
+  fba61776f97af875ce46ca20252c4165102966ebc52258208b515831462ccb0b
+  d55cba04bfd50da63faf18bd845433622daf97c06a10d0f121a4010220012158
+  205c099bec31faa581d14e208250d3ffda9ec7f543043008bc84967a8d875b5d
+  78225820539d57429fcb1c138da29010a155dca14566a8f55ac2f1780810c49d
+  4ed72d588'
 </pre><a href="#section-5.1-6" class="pilcrow">¶</a>
 </div>
 </section>
@@ -2469,10 +2473,10 @@ <h3 id="name-cose-key-reference-types">
                ; kid: Opaque identifier of ARKG-pub
   2: h'60b6dfddd31659598ae5de49acb220d8
        704949e84d484b68344340e2565337d2',
-  3: -9,       ; alg: ESP256
+  3: -65539,   ; alg: ESP256-ARKG
 
                ; ARKG-P256ADD-ECDH key handle
-               ; (truncated HMAC-SHA-256 followed by
+               ; (HMAC-SHA-256-128 followed by
                   SEC1 uncompressed ECDH public key)
   -1: h'ae079e9c52212860678a7cee25b6a6d4
         048219d973768f8e1adb8eb84b220b0ee3
@@ -2488,10 +2492,11 @@ <h3 id="name-cose-key-reference-types">
 <p id="section-5.2-6">The following is the same example encoded as CBOR:<a href="#section-5.2-6" class="pilcrow">¶</a></p>
 <div class="alignLeft art-text artwork" id="section-5.2-7">
 <pre>
-h'a40139fbb502582060b6dfddd31659598ae5de49acb220d8704949e84d484b68
-  344340e2565337d20328205851ae079e9c52212860678a7cee25b6a6d4048219
-  d973768f8e1adb8eb84b220b0ee3a2532828b9aa65254fe3717a29499e9baee7
-  0cea75b5c8a2ec2eb737834f7467e37b3254776f65f4cfc81e2bc4747a84'
+h'a5013a0001000102582060b6dfddd31659598ae5de49acb220d8704949e84d48
+  4b68344340e2565337d2033a00010002205851ae079e9c52212860678a7cee25
+  b6a6d4048219d973768f8e1adb8eb84b220b0ee3a2532828b9aa65254fe3717a
+  29499e9baee70cea75b5c8a2ec2eb737834f7467e37b3254776f65f4cfc81e2b
+  c4747a842158184578616d706c65206170706c69636174696f6e20696e666f'
 </pre><a href="#section-5.2-7" class="pilcrow">¶</a>
 </div>
 </section>
@@ -2695,6 +2700,154 @@ <h3 id="name-cose-key-type-parameters-re">
         </ul>
 </section>
 </div>
+<div id="cose-algorithms-registrations">
+<section id="section-8.3">
+        <h3 id="name-cose-algorithms-registratio">
+<a href="#section-8.3" class="section-number selfRef">8.3. </a><a href="#name-cose-algorithms-registratio" class="section-name selfRef">COSE Algorithms Registrations</a>
+        </h3>
+<p id="section-8.3-1">This section registers the following values in the IANA "COSE Algorithms" registry <span>[<a href="#IANA.cose" class="cite xref">IANA.cose</a>]</span>.<a href="#section-8.3-1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.1">
+            <p id="section-8.3-2.1.1">Name: ESP256-ARKG<a href="#section-8.3-2.1.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.1.2.1">
+                <p id="section-8.3-2.1.2.1.1">Value: TBD (Placeholder -65539)<a href="#section-8.3-2.1.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.1.2.2">
+                <p id="section-8.3-2.1.2.2.1">Description: ESP256 with key derived by ARKG-P256ADD-ECDH<a href="#section-8.3-2.1.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.1.2.3">
+                <p id="section-8.3-2.1.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.1.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.1.2.4">
+                <p id="section-8.3-2.1.2.4.1">Change Controller: TBD<a href="#section-8.3-2.1.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.1.2.5">
+                <p id="section-8.3-2.1.2.5.1">Reference: <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span>, <a href="#ARKG-P256ADD-ECDH" class="auto internal xref">Section 4.1</a> of this document<a href="#section-8.3-2.1.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.1.2.6">
+                <p id="section-8.3-2.1.2.6.1">Recommended: Yes<a href="#section-8.3-2.1.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+          <li class="normal" id="section-8.3-2.2">
+            <p id="section-8.3-2.2.1">Name: ESP384-ARKG<a href="#section-8.3-2.2.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.2.2.1">
+                <p id="section-8.3-2.2.2.1.1">Value: TBD (Placeholder -65540)<a href="#section-8.3-2.2.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.2.2.2">
+                <p id="section-8.3-2.2.2.2.1">Description: ESP384 with key derived by ARKG-P384ADD-ECDH<a href="#section-8.3-2.2.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.2.2.3">
+                <p id="section-8.3-2.2.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.2.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.2.2.4">
+                <p id="section-8.3-2.2.2.4.1">Change Controller: TBD<a href="#section-8.3-2.2.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.2.2.5">
+                <p id="section-8.3-2.2.2.5.1">Reference: <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span>, <a href="#ARKG-P384ADD-ECDH" class="auto internal xref">Section 4.2</a> of this document<a href="#section-8.3-2.2.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.2.2.6">
+                <p id="section-8.3-2.2.2.6.1">Recommended: Yes<a href="#section-8.3-2.2.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+          <li class="normal" id="section-8.3-2.3">
+            <p id="section-8.3-2.3.1">Name: ESP512-ARKG<a href="#section-8.3-2.3.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.3.2.1">
+                <p id="section-8.3-2.3.2.1.1">Value: TBD (Placeholder -65541)<a href="#section-8.3-2.3.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.3.2.2">
+                <p id="section-8.3-2.3.2.2.1">Description: ESP512 with key derived by ARKG-P521ADD-ECDH<a href="#section-8.3-2.3.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.3.2.3">
+                <p id="section-8.3-2.3.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.3.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.3.2.4">
+                <p id="section-8.3-2.3.2.4.1">Change Controller: TBD<a href="#section-8.3-2.3.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.3.2.5">
+                <p id="section-8.3-2.3.2.5.1">Reference: <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span>, <a href="#ARKG-P521ADD-ECDH" class="auto internal xref">Section 4.3</a> of this document<a href="#section-8.3-2.3.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.3.2.6">
+                <p id="section-8.3-2.3.2.6.1">Recommended: Yes<a href="#section-8.3-2.3.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+          <li class="normal" id="section-8.3-2.4">
+            <p id="section-8.3-2.4.1">Name: ES256K-ARKG<a href="#section-8.3-2.4.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.4.2.1">
+                <p id="section-8.3-2.4.2.1.1">Value: TBD (Placeholder -65542)<a href="#section-8.3-2.4.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.4.2.2">
+                <p id="section-8.3-2.4.2.2.1">Description: ES256K with key derived by ARKG-P256kADD-ECDH<a href="#section-8.3-2.4.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.4.2.3">
+                <p id="section-8.3-2.4.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.4.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.4.2.4">
+                <p id="section-8.3-2.4.2.4.1">Change Controller: TBD<a href="#section-8.3-2.4.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.4.2.5">
+                <p id="section-8.3-2.4.2.5.1">Reference: <span>[<a href="#RFC8812" class="cite xref">RFC8812</a>]</span>, <a href="#ARKG-P256kADD-ECDH" class="auto internal xref">Section 4.4</a> of this document<a href="#section-8.3-2.4.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.4.2.6">
+                <p id="section-8.3-2.4.2.6.1">Recommended: Yes<a href="#section-8.3-2.4.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+          <li class="normal" id="section-8.3-2.5">
+            <p id="section-8.3-2.5.1">Name: Ed25519-ARKG<a href="#section-8.3-2.5.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.5.2.1">
+                <p id="section-8.3-2.5.2.1.1">Value: TBD (Placeholder -65543)<a href="#section-8.3-2.5.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.5.2.2">
+                <p id="section-8.3-2.5.2.2.1">Description: Ed25519 with key derived by ARKG-edwards25519ADD-X25519<a href="#section-8.3-2.5.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.5.2.3">
+                <p id="section-8.3-2.5.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.5.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.5.2.4">
+                <p id="section-8.3-2.5.2.4.1">Change Controller: TBD<a href="#section-8.3-2.5.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.5.2.5">
+                <p id="section-8.3-2.5.2.5.1">Reference: <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span>, <a href="#ARKG-edwards25519ADD-X25519" class="auto internal xref">Section 4.7</a> of this document<a href="#section-8.3-2.5.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.5.2.6">
+                <p id="section-8.3-2.5.2.6.1">Recommended: Yes<a href="#section-8.3-2.5.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+          <li class="normal" id="section-8.3-2.6">
+            <p id="section-8.3-2.6.1">Name: Ed448-ARKG<a href="#section-8.3-2.6.1" class="pilcrow">¶</a></p>
+<ul class="normal">
+<li class="normal" id="section-8.3-2.6.2.1">
+                <p id="section-8.3-2.6.2.1.1">Value: TBD (Placeholder -65544)<a href="#section-8.3-2.6.2.1.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.6.2.2">
+                <p id="section-8.3-2.6.2.2.1">Description: Ed448 with key derived by ARKG-edwards448ADD-X448<a href="#section-8.3-2.6.2.2.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.6.2.3">
+                <p id="section-8.3-2.6.2.3.1">Capabilities: [kty]<a href="#section-8.3-2.6.2.3.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.6.2.4">
+                <p id="section-8.3-2.6.2.4.1">Change Controller: TBD<a href="#section-8.3-2.6.2.4.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.6.2.5">
+                <p id="section-8.3-2.6.2.5.1">Reference: <span>[<a href="#fully-spec-algs" class="cite xref">fully-spec-algs</a>]</span>, <a href="#ARKG-edwards448ADD-X448" class="auto internal xref">Section 4.8</a> of this document<a href="#section-8.3-2.6.2.5.1" class="pilcrow">¶</a></p>
+</li>
+              <li class="normal" id="section-8.3-2.6.2.6">
+                <p id="section-8.3-2.6.2.6.1">Recommended: Yes<a href="#section-8.3-2.6.2.6.1" class="pilcrow">¶</a></p>
+</li>
+            </ul>
+</li>
+        </ul>
+</section>
+</div>
 </section>
 </div>
 <div id="design-rationale">
@@ -2944,13 +3097,13 @@ <h2 id="name-document-history">
               <p id="appendix-C-1.4.2.3.1">Added reference to Shoup for definition of key encapsulation mechanism.<a href="#appendix-C-1.4.2.3.1" class="pilcrow">¶</a></p>
 </li>
             <li class="normal" id="appendix-C-1.4.2.4">
-              <p id="appendix-C-1.4.2.4.1">Added CDDL definition of COSE_Key_Ref.<a href="#appendix-C-1.4.2.4.1" class="pilcrow">¶</a></p>
+              <p id="appendix-C-1.4.2.4.1">Added CDDL definition of COSE_Key_Ref<a href="#appendix-C-1.4.2.4.1" class="pilcrow">¶</a></p>
 </li>
             <li class="normal" id="appendix-C-1.4.2.5">
               <p id="appendix-C-1.4.2.5.1">Editorial fixes to references.<a href="#appendix-C-1.4.2.5.1" class="pilcrow">¶</a></p>
 </li>
             <li class="normal" id="appendix-C-1.4.2.6">
-              <p id="appendix-C-1.4.2.6.1">Removed proposed COSE Algorithms registrations.<a href="#appendix-C-1.4.2.6.1" class="pilcrow">¶</a></p>
+              <p id="appendix-C-1.4.2.6.1">Renamed proposed COSE Key Types.<a href="#appendix-C-1.4.2.6.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>
diff --git a/arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.txt b/restore-cose-algs/draft-bradleylundberg-cfrg-arkg.txt
similarity index 94%
rename from arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.txt
rename to restore-cose-algs/draft-bradleylundberg-cfrg-arkg.txt
index 326df1e..808e59f 100644
--- a/arkg-cose-algs/draft-bradleylundberg-cfrg-arkg.txt
+++ b/restore-cose-algs/draft-bradleylundberg-cfrg-arkg.txt
@@ -5,7 +5,7 @@
 Crypto Forum                                            E. Lundberg, Ed.
 Internet-Draft                                                J. Bradley
 Intended status: Informational                                    Yubico
-Expires: 15 March 2025                                 11 September 2024
+Expires: 18 April 2025                                   15 October 2024
 
 
         The Asynchronous Remote Key Generation (ARKG) algorithm
@@ -54,7 +54,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 15 March 2025.
+   This Internet-Draft will expire on 18 April 2025.
 
 Copyright Notice
 
@@ -104,6 +104,7 @@ Table of Contents
    8.  IANA Considerations
      8.1.  COSE Key Types Registrations
      8.2.  COSE Key Type Parameters Registrations
+     8.3.  COSE Algorithms Registrations
    9.  Design rationale
      9.1.  Using a MAC
      9.2.  Implementation Status
@@ -582,7 +583,7 @@ Table of Contents
            PRK: prk
            info: 'ARKG-KEM-HMAC-mac.' || DST_ext || info
            L: L
-       t = HMAC-Hash-128(K=mk, text=info_sub)
+       t = HMAC-Hash-128(K=mk, text=c')
 
        k = HKDF-Expand with the arguments:
            Hash: Hash
@@ -610,7 +611,7 @@ Table of Contents
            info: 'ARKG-KEM-HMAC-mac.' || DST_ext || info
            L: L
 
-       t' = HMAC-Hash-128(K=mk, text=info_sub)
+       t' = HMAC-Hash-128(K=mk, text=c')
        If t = t':
            k = HKDF-Expand with the arguments:
                Hash: Hash
@@ -1013,8 +1014,8 @@ Table of Contents
    key type parameters -1 and -2 for the BL and KEM public key,
    respectively.
 
-   The alg parameter defines the alg parameter of ARKG derived public
-   keys derived from this ARKG public seed.
+   The alg parameter, when present, defines the alg parameter of ARKG
+   derived public keys derived from this ARKG public seed.
 
    The following CDDL [RFC8610] example represents an ARKG-P256ADD-ECDH
    public seed restricted to generating derived public keys for use with
@@ -1048,13 +1049,13 @@ Table of Contents
 
    The following is the same example encoded as CBOR:
 
-   h'a50139fbb402582060b6dfddd31659598ae5de49acb220d8704949e84d484b68
-     344340e2565337d2032820a40102200121582069380fc1c3b09652134feefba6
-     1776f97af875ce46ca20252c4165102966ebc52258208b515831462ccb0bd55c
-     ba04bfd50da63faf18bd845433622daf97c06a10d0f121a4010220012158205c
-     099bec31faa581d14e208250d3ffda9ec7f543043008bc84967a8d875b5d7822
-     5820539d57429fcb1c138da29010a155dca14566a8f55ac2f1780810c49d4ed7
-     2d58'
+   h'a5013a0001000002582060b6dfddd31659598ae5de49acb220d8704949e84d48
+     4b68344340e2565337d2032820a40102200121582069380fc1c3b09652134fee
+     fba61776f97af875ce46ca20252c4165102966ebc52258208b515831462ccb0b
+     d55cba04bfd50da63faf18bd845433622daf97c06a10d0f121a4010220012158
+     205c099bec31faa581d14e208250d3ffda9ec7f543043008bc84967a8d875b5d
+     78225820539d57429fcb1c138da29010a155dca14566a8f55ac2f1780810c49d
+     4ed72d588'
 
 5.2.  COSE key reference types
 
@@ -1085,10 +1086,10 @@ Table of Contents
                   ; kid: Opaque identifier of ARKG-pub
      2: h'60b6dfddd31659598ae5de49acb220d8
           704949e84d484b68344340e2565337d2',
-     3: -9,       ; alg: ESP256
+     3: -65539,   ; alg: ESP256-ARKG
 
                   ; ARKG-P256ADD-ECDH key handle
-                  ; (truncated HMAC-SHA-256 followed by
+                  ; (HMAC-SHA-256-128 followed by
                      SEC1 uncompressed ECDH public key)
      -1: h'ae079e9c52212860678a7cee25b6a6d4
            048219d973768f8e1adb8eb84b220b0ee3
@@ -1102,10 +1103,11 @@ Table of Contents
 
    The following is the same example encoded as CBOR:
 
-   h'a40139fbb502582060b6dfddd31659598ae5de49acb220d8704949e84d484b68
-     344340e2565337d20328205851ae079e9c52212860678a7cee25b6a6d4048219
-     d973768f8e1adb8eb84b220b0ee3a2532828b9aa65254fe3717a29499e9baee7
-     0cea75b5c8a2ec2eb737834f7467e37b3254776f65f4cfc81e2bc4747a84'
+   h'a5013a0001000102582060b6dfddd31659598ae5de49acb220d8704949e84d48
+     4b68344340e2565337d2033a00010002205851ae079e9c52212860678a7cee25
+     b6a6d4048219d973768f8e1adb8eb84b220b0ee3a2532828b9aa65254fe3717a
+     29499e9baee70cea75b5c8a2ec2eb737834f7467e37b3254776f65f4cfc81e2b
+     c4747a842158184578616d706c65206170706c69636174696f6e20696e666f'
 
 6.  Security Considerations
 
@@ -1222,6 +1224,96 @@ Table of Contents
 
       -  Reference: Section 5.2 of this document
 
+8.3.  COSE Algorithms Registrations
+
+   This section registers the following values in the IANA "COSE
+   Algorithms" registry [IANA.cose].
+
+   *  Name: ESP256-ARKG
+
+      -  Value: TBD (Placeholder -65539)
+
+      -  Description: ESP256 with key derived by ARKG-P256ADD-ECDH
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [fully-spec-algs], Section 4.1 of this document
+
+      -  Recommended: Yes
+
+   *  Name: ESP384-ARKG
+
+      -  Value: TBD (Placeholder -65540)
+
+      -  Description: ESP384 with key derived by ARKG-P384ADD-ECDH
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [fully-spec-algs], Section 4.2 of this document
+
+      -  Recommended: Yes
+
+   *  Name: ESP512-ARKG
+
+      -  Value: TBD (Placeholder -65541)
+
+      -  Description: ESP512 with key derived by ARKG-P521ADD-ECDH
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [fully-spec-algs], Section 4.3 of this document
+
+      -  Recommended: Yes
+
+   *  Name: ES256K-ARKG
+
+      -  Value: TBD (Placeholder -65542)
+
+      -  Description: ES256K with key derived by ARKG-P256kADD-ECDH
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [RFC8812], Section 4.4 of this document
+
+      -  Recommended: Yes
+
+   *  Name: Ed25519-ARKG
+
+      -  Value: TBD (Placeholder -65543)
+
+      -  Description: Ed25519 with key derived by ARKG-
+         edwards25519ADD-X25519
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [fully-spec-algs], Section 4.7 of this document
+
+      -  Recommended: Yes
+
+   *  Name: Ed448-ARKG
+
+      -  Value: TBD (Placeholder -65544)
+
+      -  Description: Ed448 with key derived by ARKG-edwards448ADD-X448
+
+      -  Capabilities: [kty]
+
+      -  Change Controller: TBD
+
+      -  Reference: [fully-spec-algs], Section 4.8 of this document
+
+      -  Recommended: Yes
+
 9.  Design rationale
 
 9.1.  Using a MAC
@@ -1453,11 +1545,11 @@ Appendix C.  Document History
       -  Added reference to Shoup for definition of key encapsulation
          mechanism.
 
-      -  Added CDDL definition of COSE_Key_Ref.
+      -  Added CDDL definition of COSE_Key_Ref
 
       -  Editorial fixes to references.
 
-      -  Removed proposed COSE Algorithms registrations.
+      -  Renamed proposed COSE Key Types.
 
 Contributors
 
diff --git a/arkg-cose-algs/index.html b/restore-cose-algs/index.html
similarity index 87%
rename from arkg-cose-algs/index.html
rename to restore-cose-algs/index.html
index ba51fb8..9312b3d 100644
--- a/arkg-cose-algs/index.html
+++ b/restore-cose-algs/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Yubico/arkg-rfc arkg-cose-algs preview</title>
+    <title>Yubico/arkg-rfc restore-cose-algs preview</title>
     <meta name="viewport" content="initial-scale=1.0">
     <style type="text/css">/*<![CDATA[*/
       body { font-family: "Helvetica Neue","Open Sans", Helvetica, Calibri,sans-serif; }
@@ -13,8 +13,8 @@
     /*]]>*/</style>
   </head>
   <body>
-    <h1>Editor's drafts for arkg-cose-algs branch of <a href="https://github.com/Yubico/arkg-rfc/tree/arkg-cose-algs">Yubico/arkg-rfc</a></h1>
-    <table id="branch-arkg-cose-algs">
+    <h1>Editor's drafts for restore-cose-algs branch of <a href="https://github.com/Yubico/arkg-rfc/tree/restore-cose-algs">Yubico/arkg-rfc</a></h1>
+    <table id="branch-restore-cose-algs">
       <tr>
         <td><a href="./draft-bradleylundberg-cfrg-arkg.html" class="html draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (HTML)">ARKG</a></td>
         <td><a href="./draft-bradleylundberg-cfrg-arkg.txt" class="txt draft-bradleylundberg-cfrg-arkg" title="The Asynchronous Remote Key Generation (ARKG) algorithm (Text)">plain text</a></td>