Use RFC 8809

index.bs

@@ -873,7 +873,7 @@ below and in [[#index-defined-elsewhere]].
 :: This specification describes the syntax of all [=CBOR=]-encoded data using the CBOR Data Definition Language (<dfn>CDDL</dfn>) [[!RFC8610]].
 
 : COSE
-:: CBOR Object Signing and Encryption (COSE) [[!RFC8152]].  The IANA COSE Algorithms registry established by this specification is also used.
+:: CBOR Object Signing and Encryption (COSE) [[!RFC8152]].  The IANA COSE Algorithms registry [[!IANA-COSE-ALGS-REG]] established by this specification is also used.
 
 :  Credential Management
 :: The API described in this document is an extension of the {{Credential}} concept defined in [[!CREDENTIAL-MANAGEMENT-1]].
@@ -2537,7 +2537,7 @@ optionally evidence of [=user consent=] to a specific transaction.
     ::  This member contains additional parameters requesting additional processing by the client and authenticator. For
         example, the caller may request that only authenticators with certain capabilities be used to create the credential, or
         that particular information be returned in the [=attestation object=]. Some extensions are defined in [[#sctn-extensions]];
-        consult the IANA "WebAuthn Extension Identifier" registry established by [[!WebAuthn-Registries]] for an up-to-date list
+        consult the IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]] for an up-to-date list
         of registered [=WebAuthn Extensions=].
 </div>
 
@@ -4423,13 +4423,14 @@ In order to perform a [=registration ceremony=], the [=[RP]=] MUST proceed as fo
 1. Determine the attestation statement format by performing a USASCII case-sensitive match on |fmt| against the set of
     supported WebAuthn Attestation Statement Format Identifier values.
     An up-to-date list of registered WebAuthn Attestation Statement Format Identifier values
-    is maintained in the IANA registry of the same name [[!WebAuthn-Registries]].
+    is maintained in the
+    IANA "WebAuthn Attestation Statement Format Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 
 1. Verify that |attStmt| is a correct [=attestation statement=], conveying a valid [=attestation signature=], by using the
     [=attestation statement format=] |fmt|'s [=verification procedure=] given |attStmt|, |authData| and |hash|.
 
     Note: Each [=attestation statement format=] specifies its own [=verification procedure=]. See [[#sctn-defined-attestation-formats]] for
-    the initially-defined formats, and [[!WebAuthn-Registries]] for the up-to-date list.
+    the initially-defined formats, and [[!IANA-WebAuthn-Registries]] for the up-to-date list.
 
 1. If validation is successful, obtain a list of acceptable trust anchors (i.e. attestation root certificates)
     for that attestation type and attestation statement format |fmt|, from a trusted source or from policy. For
@@ -4617,8 +4618,9 @@ WebAuthn supports pluggable attestation statement formats. This section defines
 Attestation statement formats are identified by a string, called an <dfn>attestation statement format identifier</dfn>, chosen by
 the author of the [=attestation statement format=].
 
-Attestation statement format identifiers SHOULD be registered per [[!WebAuthn-Registries]] "Registries for Web Authentication
-(WebAuthn)". All registered attestation statement format identifiers are unique amongst themselves as a matter of course.
+Attestation statement format identifiers SHOULD be registered in the
+IANA "WebAuthn Attestation Statement Format Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
+All registered attestation statement format identifiers are unique amongst themselves as a matter of course.
 
 Unregistered attestation statement format identifiers SHOULD use lowercase reverse domain-name naming, using a domain name
 registered by the developer, in order to assure uniqueness of the identifier. All attestation statement format identifiers MUST
@@ -4633,8 +4635,8 @@ Attestation statement formats that may exist in multiple versions SHOULD include
 different versions are thus treated as different formats, e.g., `packed2` as a new version of the [[#sctn-packed-attestation]].
 
 The following sections present a set of currently-defined and registered attestation statement formats and their identifiers.
-The up-to-date list of registered [=WebAuthn Extensions=] is maintained in the IANA "WebAuthn Attestation Statement Format
-Identifier" registry established by [[!WebAuthn-Registries]].
+The up-to-date list of registered [=WebAuthn Extensions=] is maintained in the
+IANA "WebAuthn Attestation Statement Format Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 
 
 ## Packed Attestation Statement Format ## {#sctn-packed-attestation}
@@ -5221,15 +5223,16 @@ Note that some clients may choose to implement this pass-through capability unde
 Supporting this capability can facilitate innovation, allowing authenticators to experiment with new extensions
 and [=[RPS]=] to use them before there is explicit support for them in clients.
 
-The IANA "WebAuthn Extension Identifier" registry established by [[!WebAuthn-Registries]] can be consulted
+The IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]] can be consulted
 for an up-to-date list of registered [=WebAuthn Extensions=].
 
 
 ## Extension Identifiers ## {#sctn-extension-id}
 
 Extensions are identified by a string, called an <dfn>extension identifier</dfn>, chosen by the extension author.
 
-Extension identifiers SHOULD be registered per [[!WebAuthn-Registries]] "Registries for Web Authentication (WebAuthn)".
+Extension identifiers SHOULD be registered in the
+IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 All registered extension identifiers are unique amongst themselves as a matter of course.
 
 Unregistered extension identifiers SHOULD aim to be globally unique, e.g., by including the defining entity such as
@@ -5243,7 +5246,7 @@ Extensions that may exist in multiple versions should take care to include a ver
 versions are thus treated as different extensions, e.g., `myCompany_extension_01`
 
 [[#sctn-defined-extensions]] defines an additional set of extensions and their identifiers.
-See the IANA "WebAuthn Extension Identifier" registry established by [[!WebAuthn-Registries]]
+See the IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]]
 for an up-to-date list of registered WebAuthn Extension Identifiers.
 
 
@@ -5367,7 +5370,7 @@ There MUST NOT be any values returned for ignored extensions.
 # Defined Extensions # {#sctn-defined-extensions}
 
 This section defines an additional set of extensions to be registered in the
-IANA "WebAuthn Extension Identifier" registry established by [[!WebAuthn-Registries]].
+IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 These MAY be implemented by user agents targeting broad interoperability.
 
 
@@ -6322,7 +6325,7 @@ The [=remote end steps=] are:
 ## WebAuthn Attestation Statement Format Identifier Registrations ## {#sctn-att-fmt-reg}
 
 This section registers the attestation statement formats defined in Section [[#sctn-defined-attestation-formats]] in the
-IANA "WebAuthn Attestation Statement Format Identifier" registry established by [[!WebAuthn-Registries]].
+IANA "WebAuthn Attestation Statement Format Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 
 - WebAuthn Attestation Statement Format Identifier: packed
 - Description: The "packed" attestation statement format is a WebAuthn-optimized format for [=attestation=]. It uses a very
@@ -6352,7 +6355,7 @@ IANA "WebAuthn Attestation Statement Format Identifier" registry established by
 ## WebAuthn Extension Identifier Registrations ## {#sctn-extensions-reg}
 
 This section registers the [=extension identifier=] values defined in Section [[#sctn-extensions]] in the
-IANA "WebAuthn Extension Identifier" registry established by [[!WebAuthn-Registries]].
+IANA "WebAuthn Extension Identifiers" registry [[!IANA-WebAuthn-Registries]] established by [[!RFC8809]].
 
 - WebAuthn Extension Identifier: appidExclude
 - Description: This registration extension allows [=[WRPS]=] to exclude authenticators that contain specified credentials that were created with the legacy FIDO U2F JavaScript API [[FIDOU2FJavaScriptAPI]].
@@ -6930,18 +6933,25 @@ for their contributions as our W3C Team Contacts.
     "date": "2007"
   },
 
-  "WebAuthn-Registries": {
+  "RFC8809": {
     "authors": [
         "Jeff Hodges",
         "Giridhar Mandyam",
         "Michael B. Jones"
     ],
-    "date": "October 2019",
-    "href": "https://tools.ietf.org/html/draft-hodges-webauthn-registries",
-    "publisher": "W3C WebAuthn Working Draft",
-    "status": "Active Internet-Draft",
-    "title": "Registries for Web Authentication (WebAuthn)",
-    "id": "WebAuthn-Registries"
+    "date": "August 2020",
+    "href": "https://www.rfc-editor.org/rfc/rfc8809",
+    "publisher": "IETF",
+    "status": "IETF Proposed Standard",
+    "title": "Registries for Web Authentication (WebAuthn)"
+  },
+
+  "IANA-WebAuthn-Registries": {
+    "authors": [
+        "IANA"
+    ],
+    "href": "https://www.iana.org/assignments/webauthn/",
+    "title": "Web Authentication (WebAuthn) registries"
   },
 
   "SP800-800-63r3": {