Bug 25036: Fix invalid WebIDL that allowed optional parameters to importKey/unwrapKey
authorRyan Sleevi <sleevi@google.com>
Mon, 16 Jun 2014 00:00:00 -0700
changeset 179 3785b190bb2c
parent 178 5306e01d0561
child 180 c502effc79d5
Bug 25036: Fix invalid WebIDL that allowed optional parameters to importKey/unwrapKey
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Mon Jun 16 00:00:00 2014 -0700
+++ b/spec/Overview-WebCryptoAPI.xml	Mon Jun 16 00:00:00 2014 -0700
@@ -1083,7 +1083,7 @@
   <span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/35">ISSUE-35</a></span>
   Promise&lt;any&gt; <a href="#dfn-SubtleCrypto-method-importKey">importKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
                          CryptoOperationData keyData,
-                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
+                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
                          boolean extractable,
                          <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages );
   Promise&lt;any&gt; <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format, <a href="#dfn-Key">Key</a> key);
@@ -1097,7 +1097,7 @@
                          CryptoOperationData wrappedKey,
                          <a href="#dfn-Key">Key</a> unwrappingKey,
                          <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
-                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? unwrappedKeyAlgorithm,
+                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrappedKeyAlgorithm,
                          boolean extractable,
                          <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages );
 };
--- a/spec/Overview.html	Mon Jun 16 00:00:00 2014 -0700
+++ b/spec/Overview.html	Mon Jun 16 00:00:00 2014 -0700
@@ -1091,7 +1091,7 @@
   <span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/35">ISSUE-35</a></span>
   Promise&lt;any&gt; <a href="#dfn-SubtleCrypto-method-importKey">importKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
                          CryptoOperationData keyData,
-                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
+                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
                          boolean extractable,
                          <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages );
   Promise&lt;any&gt; <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format, <a href="#dfn-Key">Key</a> key);
@@ -1105,7 +1105,7 @@
                          CryptoOperationData wrappedKey,
                          <a href="#dfn-Key">Key</a> unwrappingKey,
                          <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
-                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? unwrappedKeyAlgorithm,
+                         <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrappedKeyAlgorithm,
                          boolean extractable,
                          <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages );
 };