Bug 25857 - move setting of extractable and usages to importKey and unwrapKey method descriptions
--- a/spec/Overview-WebCryptoAPI.xml Tue Sep 23 17:37:34 2014 -0700
+++ b/spec/Overview-WebCryptoAPI.xml Tue Sep 23 18:02:11 2014 -0700
@@ -2169,6 +2169,19 @@
</li>
<li>
<p>
+ Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
+ slot of <var>result</var> to <var>extractable</var>.
+ </p>
+ </li>
+ <li>
+ <p>
+ Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
+ slot of <var>result</var> to the <a href="#concept-normalized-usages">normalized
+ value</a> of <var>usages</var>.
+ </p>
+ </li>
+ <li>
+ <p>
Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
<var>result</var> as the <code>value</code> argument.
</p>
@@ -2644,6 +2657,19 @@
</li>
<li>
<p>
+ Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
+ slot of <var>result</var> to <var>extractable</var>.
+ </p>
+ </li>
+ <li>
+ <p>
+ Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
+ slot of <var>result</var> to the <a href="#concept-normalized-usages">normalized
+ value</a> of <var>usages</var>.
+ </p>
+ </li>
+ <li>
+ <p>
Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
<var>result</var> as the <code>value</code> argument.
</p>
@@ -10276,18 +10302,6 @@
internal slot of <var>key</var> to <var>algorithm</var>.
</p>
</li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
- slot of <var>key</var> to <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
</ol>
</dd>
<dt>Otherwise:</dt>
@@ -11172,19 +11186,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -11722,19 +11723,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -12238,19 +12226,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -12883,19 +12858,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -13887,19 +13849,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -14662,19 +14611,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -15287,18 +15223,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -15405,19 +15329,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -15532,19 +15443,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -16093,19 +15991,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -16401,19 +16286,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -16688,19 +16560,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
--- a/spec/Overview.html Tue Sep 23 17:37:34 2014 -0700
+++ b/spec/Overview.html Tue Sep 23 18:02:11 2014 -0700
@@ -2137,6 +2137,19 @@
</li>
<li>
<p>
+ Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
+ slot of <var>result</var> to <var>extractable</var>.
+ </p>
+ </li>
+ <li>
+ <p>
+ Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
+ slot of <var>result</var> to the <a href="#concept-normalized-usages">normalized
+ value</a> of <var>usages</var>.
+ </p>
+ </li>
+ <li>
+ <p>
Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
<var>result</var> as the <code>value</code> argument.
</p>
@@ -2595,6 +2608,19 @@
</li>
<li>
<p>
+ Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
+ slot of <var>result</var> to <var>extractable</var>.
+ </p>
+ </li>
+ <li>
+ <p>
+ Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
+ slot of <var>result</var> to the <a href="#concept-normalized-usages">normalized
+ value</a> of <var>usages</var>.
+ </p>
+ </li>
+ <li>
+ <p>
Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
<var>result</var> as the <code>value</code> argument.
</p>
@@ -9903,18 +9929,6 @@
internal slot of <var>key</var> to <var>algorithm</var>.
</p>
</li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal
- slot of <var>key</var> to <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
</ol>
</dd>
<dt>Otherwise:</dt>
@@ -10757,19 +10771,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -11295,19 +11296,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -11806,19 +11794,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -12434,19 +12409,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -13407,19 +13369,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -14169,19 +14118,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -14768,18 +14704,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -14876,19 +14800,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -14994,19 +14905,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -15536,19 +15434,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -15841,19 +15726,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]]
- internal slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot
- of <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>
@@ -16120,19 +15992,6 @@
</li>
<li>
<p>
- Set the [[<a href="#dfn-CryptoKey-slot-extractable">extractable</a>]] internal
- slot of <var>key</var> to <var>extractable</var>.
- </p>
- </li>
- <li>
- <p>
- Set the [[<a href="#dfn-CryptoKey-slot-usages">usages</a>]] internal slot of
- <var>key</var> to the <a href="#concept-normalized-usages">normalized
- value</a> of <var>usages</var>.
- </p>
- </li>
- <li>
- <p>
Return <var>key</var>.
</p>
</li>