Bug 22547: Fix derive -> deriveKey
authorRyan Sleevi <sleevi@google.com>
Wed, 03 Jul 2013 16:47:28 -0700
changeset 64 f5734f8b2e6a
parent 63 0e0ada1059f6
child 65 1907b69982c7
Bug 22547: Fix derive -> deriveKey
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Wed Jul 03 16:42:10 2013 -0700
+++ b/spec/Overview-WebCryptoAPI.xml	Wed Jul 03 16:47:28 2013 -0700
@@ -684,7 +684,7 @@
   "decrypt",
   "sign",
   "verify",
-  "derive",
+  "deriveKey",
   "wrapKey",
   "unwrapKey"
 };
@@ -1831,7 +1831,7 @@
               <li>
                 <p>
                   If <var>baseKey</var>.<a href="#dfn-Key-usages"><code>usages</code></a> does not
-                  contain the <code>"derive"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
+                  contain the <code>"deriveKey"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
                   terminate this algorithm with an error.
                 </p>
               </li>
@@ -1875,7 +1875,7 @@
               <li>
                 <p>
                   If <var>normalizedAlgorithm</var> does not describe a
-                  <a href="#algorithms">registered algorithm</a> that supports the derive
+                  <a href="#algorithms">registered algorithm</a> that supports the deriveKey
                   operation, throw a <code>NotSupportedError</code> and
                   <a href="#terminate-the-algorithm">terminate the algorithm</a>.
                 </p>
--- a/spec/Overview.html	Wed Jul 03 16:42:10 2013 -0700
+++ b/spec/Overview.html	Wed Jul 03 16:47:28 2013 -0700
@@ -693,7 +693,7 @@
   "decrypt",
   "sign",
   "verify",
-  "derive",
+  "deriveKey",
   "wrapKey",
   "unwrapKey"
 };
@@ -1840,7 +1840,7 @@
               <li>
                 <p>
                   If <var>baseKey</var>.<a href="#dfn-Key-usages"><code>usages</code></a> does not
-                  contain the <code>"derive"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
+                  contain the <code>"deriveKey"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
                   terminate this algorithm with an error.
                 </p>
               </li>
@@ -1884,7 +1884,7 @@
               <li>
                 <p>
                   If <var>normalizedAlgorithm</var> does not describe a
-                  <a href="#algorithms">registered algorithm</a> that supports the derive
+                  <a href="#algorithms">registered algorithm</a> that supports the deriveKey
                   operation, throw a <code>NotSupportedError</code> and
                   <a href="#terminate-the-algorithm">terminate the algorithm</a>.
                 </p>