Merge branch 'master' into vgb-etld-minus-one

w3c · Sep 9, 2016 · 4d96ebc · 4d96ebc
2 parents e348df7 + ef53034
commit 4d96ebc
Show file tree

Hide file tree

Showing 12 changed files with 217 additions and 28 deletions.
diff --git a/.bikeshed-include/copyright.include b/.bikeshed-include/copyright.include
@@ -0,0 +1 @@
+<a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © [YEAR] <a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.eu/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>). W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.
diff --git a/.bikeshed-include/footer.include b/.bikeshed-include/footer.include
@@ -0,0 +1,5 @@
+</main>
+
+</body>
+<script src="https://www.w3.org/scripts/TR/2016/fixup.js"></script>
+</html>
diff --git a/.bikeshed-include/header.include b/.bikeshed-include/header.include
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>[TITLE] [LEVEL]</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="w3c-status" content="[STATUS]">
+  <link href="[W3C-STYLESHEET-URL]" rel=stylesheet type="text/css">
+</head>
+<body class="h-entry">
+<div class="head">
+  <header>
+    <p data-fill-with="logo"></p>
+    <h1 id="title" class="p-name no-ref">[TITLE] [LEVEL]</h1>
+    <h2 id="subtitle" class="no-num no-toc no-ref">[LONGSTATUS],
+      <time class="dt-updated" datetime="[ISODATE]">[DATE]</time></h2>
+  </header>
+  <div data-fill-with="spec-metadata"></div>
+  <div data-fill-with="warning"></div>
+  <p class="copyright" data-fill-with="copyright"></p>
+  <hr title="Separator for header">
+</div>
+
+<h2 class="no-num no-toc no-ref" id="abstract">Abstract</h2>
+<div class="p-summary" data-fill-with="abstract"></div>
+
+<h2 class="no-num no-toc no-ref" id="status">Status of this document</h2>
+<div data-fill-with="status"></div>
+<div data-fill-with="at-risk"></div>
+
+<nav data-fill-with="table-of-contents" id="toc"></nav>
+<main>
diff --git a/.bikeshed-include/logo.include b/.bikeshed-include/logo.include
@@ -0,0 +1 @@
+<a href="https://www.w3.org/"><img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72" /></a>
diff --git a/.bikeshed-include/status-ED.include b/.bikeshed-include/status-ED.include
@@ -0,0 +1,44 @@
+  <p>
+    <em>This section describes the status of this document at the time of its publication. Other
+    documents may supersede this document. A list of current
+    <abbr title="World Wide Web Consortium">W3C</abbr> publications and the latest revision of this
+    technical report can be found in the
+    <a href="https://www.w3.org/TR/"><abbr title="World Wide Web Consortium">W3C</abbr> technical
+    reports index</a> at https://www.w3.org/TR/.</em>
+  </p>
+  <p>
+    This document was published by the <a href="https://www.w3.org/webauthn/">Web Authentication Working Group</a>
+    as an Editors' Draft. This document is intended to become a W3C Recommendation.
+
+    Feedback and comments on this specification are welcome. Please use
+    <a href="https://github.com/w3c/webauthn/issues">Github issues</a>.
+    Discussions may also be found in the
+    <a href="https://lists.w3.org/Archives/Public/public-webauthn/">public-webauthn@w3.org archives</a>.
+  </p>
+  <p>
+    Publication as an Editors' Draft does not imply endorsement by the
+    <abbr title="World Wide Web Consortium">W3C</abbr> Membership. This is a draft document and may
+    be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite
+    this document as other than work in progress.
+  </p>
+  <p>
+    This document was produced by a group operating under the
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004
+    <abbr title="World Wide Web Consortium">W3C</abbr> Patent Policy</a>.
+    <abbr title="World Wide Web Consortium">W3C</abbr> maintains a
+    <a href="https://www.w3.org/2004/01/pp-impl/87227/status" rel="disclosure">public list of any
+    patent disclosures</a> made in connection with the deliverables of the group; that page also
+    includes instructions for disclosing a patent. An individual who has actual knowledge of a
+    patent which the individual believes contains
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
+    Claim(s)</a> must disclose the information in accordance with
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the
+    <abbr title="World Wide Web Consortium">W3C</abbr> Patent Policy</a>.
+  </p>
+  <p>
+    This document is governed by the
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
+    <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
+  </p>
+
+  <p>[STATUSTEXT]
diff --git a/.bikeshed-include/status-WD.include b/.bikeshed-include/status-WD.include
@@ -0,0 +1,44 @@
+  <p>
+    <em>This section describes the status of this document at the time of its publication. Other
+    documents may supersede this document. A list of current
+    <abbr title="World Wide Web Consortium">W3C</abbr> publications and the latest revision of this
+    technical report can be found in the
+    <a href="https://www.w3.org/TR/"><abbr title="World Wide Web Consortium">W3C</abbr> technical
+    reports index</a> at https://www.w3.org/TR/.</em>
+  </p>
+  <p>
+    This document was published by the <a href="https://www.w3.org/webauthn/">Web Authentication Working Group</a>
+    as a Working Draft. This document is intended to become a W3C Recommendation.
+
+    Feedback and comments on this specification are welcome. Please use
+    <a href="https://github.com/w3c/webauthn/issues">Github issues</a>.
+    Discussions may also be found in the
+    <a href="https://lists.w3.org/Archives/Public/public-webauthn/">public-webauthn@w3.org archives</a>.
+  </p>
+  <p>
+    Publication as a Working Draft does not imply endorsement by the
+    <abbr title="World Wide Web Consortium">W3C</abbr> Membership. This is a draft document and may
+    be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite
+    this document as other than work in progress.
+  </p>
+  <p>
+    This document was produced by a group operating under the
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004
+    <abbr title="World Wide Web Consortium">W3C</abbr> Patent Policy</a>.
+    <abbr title="World Wide Web Consortium">W3C</abbr> maintains a
+    <a href="https://www.w3.org/2004/01/pp-impl/87227/status" rel="disclosure">public list of any
+    patent disclosures</a> made in connection with the deliverables of the group; that page also
+    includes instructions for disclosing a patent. An individual who has actual knowledge of a
+    patent which the individual believes contains
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
+    Claim(s)</a> must disclose the information in accordance with
+    <a href="https://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the
+    <abbr title="World Wide Web Consortium">W3C</abbr> Patent Policy</a>.
+  </p>
+  <p>
+    This document is governed by the
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
+    <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
+  </p>
+
+  <p>[STATUSTEXT]
diff --git a/.deploy-output.sh b/.deploy-output.sh
@@ -5,8 +5,8 @@ STATUS=`git log -1 --pretty=oneline`
 rm -rf out
 mkdir out
 cp index.html ./out/
-mkdir ./out/img
-cp img/* ./out/img
+mkdir ./out/images
+cp images/* ./out/images
 
 cd out
 git init

diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ install:
 # Use cached copy of bikeshed data files to give consistent builds
 #- bikeshed update
 - cp -R .spec-data/* ./bikeshed/bikeshed/spec-data
+- cp -R .bikeshed-include/* ./bikeshed/bikeshed/include/webauthn
 script: 'bikeshed spec'
 after_success:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && ./.deploy-output.sh'

diff --git a/draft-hodges-webauthn-registries.xml b/draft-hodges-webauthn-registries.xml
@@ -25,7 +25,7 @@
 
 
 
-<rfc category="info" ipr="trust200902" docName="draft-hodges-webauthn-registries-00b">
+<rfc category="info" ipr="trust200902" docName="draft-hodges-webauthn-registries-00c">
   <front>
     <title>Registries for Web Authentication (WebAuthn)</title>
 
@@ -73,7 +73,7 @@
 
           <t>
             WebAuthn attestation format identifiers are strings whose semantic, syntactic,
-            uniqueness, and string-matching criteria are specified in <xref target="WebAuthn"/>, 
+            and string-matching criteria are specified in <xref target="WebAuthn"/>, 
             along with the concepts of attestation and attestation formats.
           </t>
           <t>
@@ -98,6 +98,8 @@
           </t>
           <t>
             The Expert(s) MAY define additional fields to be collected in the registry.
+            Each attestation format identifier added to this registry MUST be unique
+            amongst the set of registered attestation format identifiers. 
           </t>
           <t>
             See <xref target="sctn-attstn-format-reg-cnts"/> for intial registrations, 
@@ -130,7 +132,7 @@
 
           <t>
             WebAuthn extension identifiers are strings whose semantic, syntactic,
-            uniqueness, and string-matching criteria are specified in <xref target="WebAuthn"/>.
+            and string-matching criteria are specified in <xref target="WebAuthn"/>.
           </t>
           <t>
             WebAuthn extension identifiers are registered on the advice of a Designated Expert
@@ -154,6 +156,8 @@
 
           <t>
             The Expert(s) MAY define additional fields to be collected in the registry.
+            Each extension identifier added to this registry MUST be unique
+            amongst the set of registered extension identifiers. 
           </t>
           <t>
             See <xref target="sctn-extn-id-reg-cnts"/> for intial registrations, 

diff --git a/img/fido-signature-formats-figure1.svg → images/fido-signature-formats-figure1.svg b/img/fido-signature-formats-figure1.svg → images/fido-signature-formats-figure1.svg
diff --git a/img/fido-signature-formats-figure2.svg → images/fido-signature-formats-figure2.svg b/img/fido-signature-formats-figure2.svg → images/fido-signature-formats-figure2.svg