Merge remote-tracking branch 'refs/remotes/origin/master' into vgb-mo…

…dular-attestation
w3c · Aug 10, 2016 · c27b4bf · c27b4bf
2 parents 9c7d00d + 2b72ddf
commit c27b4bf
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/index.bs b/index.bs
@@ -319,9 +319,9 @@ The API is defined by the following Web IDL fragment.
     };
 
     dictionary CredentialOptions {
-        unsigned long            timeoutSeconds;
-        sequence < Credential >  excludeList;
-        WebAuthnExtensions       extensions;
+        unsigned long                       timeoutSeconds;
+        sequence < CredentialDescription >  excludeList;
+        WebAuthnExtensions                  extensions;
     };
 
     interface WebAuthnAssertion {
@@ -332,9 +332,9 @@ The API is defined by the following Web IDL fragment.
     };
 
     dictionary AssertionOptions {
-        unsigned long           timeoutSeconds;
-        sequence < Credential > allowList;
-        WebAuthnExtensions      extensions;
+        unsigned long                      timeoutSeconds;
+        sequence < CredentialDescription > allowList;
+        WebAuthnExtensions                 extensions;
     };
 
     dictionary WebAuthnExtensions {
@@ -353,7 +353,12 @@ The API is defined by the following Web IDL fragment.
 
     interface Credential {
         readonly attribute CredentialType type;
-        readonly attribute BufferSource   id;
+        readonly attribute ArrayBuffer    id;
+    };
+
+    dictionary CredentialDescription {
+        required CredentialType type;
+        required BufferSource   id;
     };
 </pre>
 
@@ -741,6 +746,18 @@ by the caller to select a credential for use.
 </div>
 
 
+### Credential Descriptor (dictionary <dfn dictionary>CredentialDescription</dfn>) ### {#credential-dictionary}
+
+This dictionary contains the attributes that are specified by a caller when referring to a credential as an input parameter to
+the {{makeCredential()}} or {{getAssertion()}} method. It mirrors the fields of the {{Credential}} object returned by these methods.
+
+<div dfn-for="CredentialDescription">
+    The <dfn>type</dfn> attribute contains the type of the credential the caller is referring to.
+
+    The <dfn>id</dfn> attribute contains the identifier of the credential that the caller is referring to.
+</div>
+
+
 ### Cryptographic Algorithm Identifier (type {{AlgorithmIdentifier}}) ### {#alg-identifier}
 
 A string or dictionary identifying a cryptographic algorithm and optionally a set of parameters for that algorithm. This type is