--- 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
@@ -1427,7 +1427,7 @@
<li>
<p>
Let <var>result</var> be the result of performing the sign operation
- specified by <var>normalizedAlgorithm</var> uaing <var>key</var> and
+ specified by <var>normalizedAlgorithm</var> using <var>key</var> and
<var>algorithm</var> and with <var>data</var> as <var>message</var>.
</p>
</li>
@@ -1912,8 +1912,9 @@
<div id="SubtleCrypto-method-importKey" class="section">
<h4>The <a href="#dfn-SubtleCrypto-method-importKey">importKey</a> method</h4>
<p>
- When invoked, the <dfn id="dfn-SubtleCrypto-method-importKey">importKey</dfn> method
- <span class="RFC2119">MUST</span> perform the following steps:
+ When invoked, the <dfn
+ id="dfn-SubtleCrypto-method-importKey"><code>importKey</code></dfn> method <span
+ class="RFC2119">MUST</span> perform the following steps:
</p>
<ol>
<li>
@@ -2024,16 +2025,16 @@
<div id="SubtleCrypto-method-exportKey" class="section">
<h4>The <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a> method</h4>
<p>
- When invoked, the <dfn id="dfn-SubtleCrypto-method-exportKey">exportKey</dfn> method
- <span class="RFC2119">MUST</span> perform the following steps:
+ When invoked, the <dfn
+ id="dfn-SubtleCrypto-method-exportKey"><code>exportKey</code></dfn> method <span
+ class="RFC2119">MUST</span> perform the following steps:
</p>
<ol>
<li>
<p>
- Let <var>format</var> and <var>key</var> be the <code>format</code>
- and <code>key</code> parameters passed to the
- <a href="#dfn-SubtleCrypto-method-importKey">importKey</a> method,
- respectively.
+ Let <var>format</var> and <var>key</var> be the <code>format</code> and
+ <code>key</code> parameters passed to the <a
+ href="#dfn-SubtleCrypto-method-exportKey">exportKey</a> method, respectively.
</p>
</li>
<li>
@@ -2064,6 +2065,13 @@
</li>
<li>
<p>
+ Let <var>normalizedAlgorithm</var> be the result of
+ <a href="#dfn-normalize-to-type">normalizing</a> <var>algorithm</var>
+ to <a href="#dfn-Algorithm">Algorithm</a>.
+ </p>
+ </li>
+ <li>
+ <p>
If <var>format</var> is not a
<a href="#dfn-RecognizedKeyFormats">recognized key
format value</a>, then <a href="#concept-return-an-error">return an error</a> named
@@ -2172,10 +2180,9 @@
</li>
<li>
<p>
- If <var>format</var> is not algorithm a
- <a href="#dfn-RecognizedKeyFormats">recognized key
- format value</a>, then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-SyntaxError"><code>SyntaxError</code></a>.
+ If <var>format</var> is not a <a href="#dfn-RecognizedKeyFormats">recognized key
+ format value</a>, then <a href="#concept-return-an-error">return an error</a>
+ named <a href="#dfn-SyntaxError"><code>SyntaxError</code></a>.
</p>
</li>
<li>
@@ -2230,8 +2237,8 @@
<p>
Let <var>result</var> be the result of performing the wrap key operation
specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
- <var>wrappingKey</var>
- as <var>key</var> and <var>bytes</var> as <var>plaintext</var>.
+ <var>wrappingKey</var> as <var>key</var> and <var>bytes</var> as
+ <var>plaintext</var>.
</p>
</dd>
<dt>Otherwise, if <var>normalizedAlgorithm</var> supports the encrypt operation:</dt>
@@ -2239,8 +2246,8 @@
<p>
Let <var>result</var> be the result of performing the encrypt operation
specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
- <var>wrappingKey</var>
- as <var>key</var> and <var>bytes</var> as <var>plaintext</var>.
+ <var>wrappingKey</var> as <var>key</var> and <var>bytes</var> as
+ <var>plaintext</var>.
</p>
</dd>
<dt>Otherwise:</dt>
@@ -2374,11 +2381,10 @@
</li>
<li>
<dl class="switch">
- <dt>If <var>normalizedUnwrapAlgorithm</var> supports an unwrap key operation:</dt>
+ <dt>If <var>normalizedAlgorithm</var> supports an unwrap key operation:</dt>
<dd>
Let <var>bytes</var> be the result of performing the unwrap key operation
- specified by <var>normalizedAlgorithm</var> using
- <var>algorithm</var>,
+ specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
<var>unwrappingKey</var> as <var>key</var> and <var>wrappedKey</var> as
<var>ciphertext</var>.
</dd>
@@ -2387,9 +2393,8 @@
operation:
</dt>
<dd>
- Let <var>bytes</var> be the result of performing the decrypt operation
- specified by <var>normalizedAlgorithm</var> using
- <var>algorithm</var>,
+ Let <var>bytes</var> be the result of performing the decrypt operation specified
+ by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
<var>unwrappingKey</var> as <var>key</var> and <var>wrappedKey</var> as
<var>ciphertext</var>.
</dd>
@@ -2439,7 +2444,7 @@
</tr>
<tr>
<td><dfn id="dfn-SyntaxError"><code>SyntaxError</code></dfn></td>
- <td>A required parameter was missing our out-of-range</td>
+ <td>A required parameter was missing or out-of-range</td>
</tr>
<tr>
<td><dfn id="dfn-InvalidStateError"><code>InvalidStateError</code></dfn></td>
--- a/spec/Overview.html Mon Jun 16 00:00:00 2014 -0700
+++ b/spec/Overview.html Mon Jun 16 00:00:00 2014 -0700
@@ -1426,7 +1426,7 @@
<li>
<p>
Let <var>result</var> be the result of performing the sign operation
- specified by <var>normalizedAlgorithm</var> uaing <var>key</var> and
+ specified by <var>normalizedAlgorithm</var> using <var>key</var> and
<var>algorithm</var> and with <var>data</var> as <var>message</var>.
</p>
</li>
@@ -1904,8 +1904,7 @@
<div id="SubtleCrypto-method-importKey" class="section">
<h4>14.3.9. The <a href="#dfn-SubtleCrypto-method-importKey">importKey</a> method</h4>
<p>
- When invoked, the <dfn id="dfn-SubtleCrypto-method-importKey">importKey</dfn> method
- <span class="RFC2119">MUST</span> perform the following steps:
+ When invoked, the <dfn id="dfn-SubtleCrypto-method-importKey"><code>importKey</code></dfn> method <span class="RFC2119">MUST</span> perform the following steps:
</p>
<ol>
<li>
@@ -2016,16 +2015,13 @@
<div id="SubtleCrypto-method-exportKey" class="section">
<h4>14.3.10. The <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a> method</h4>
<p>
- When invoked, the <dfn id="dfn-SubtleCrypto-method-exportKey">exportKey</dfn> method
- <span class="RFC2119">MUST</span> perform the following steps:
+ When invoked, the <dfn id="dfn-SubtleCrypto-method-exportKey"><code>exportKey</code></dfn> method <span class="RFC2119">MUST</span> perform the following steps:
</p>
<ol>
<li>
<p>
- Let <var>format</var> and <var>key</var> be the <code>format</code>
- and <code>key</code> parameters passed to the
- <a href="#dfn-SubtleCrypto-method-importKey">importKey</a> method,
- respectively.
+ Let <var>format</var> and <var>key</var> be the <code>format</code> and
+ <code>key</code> parameters passed to the <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a> method, respectively.
</p>
</li>
<li>
@@ -2056,6 +2052,13 @@
</li>
<li>
<p>
+ Let <var>normalizedAlgorithm</var> be the result of
+ <a href="#dfn-normalize-to-type">normalizing</a> <var>algorithm</var>
+ to <a href="#dfn-Algorithm">Algorithm</a>.
+ </p>
+ </li>
+ <li>
+ <p>
If <var>format</var> is not a
<a href="#dfn-RecognizedKeyFormats">recognized key
format value</a>, then <a href="#concept-return-an-error">return an error</a> named
@@ -2162,10 +2165,9 @@
</li>
<li>
<p>
- If <var>format</var> is not algorithm a
- <a href="#dfn-RecognizedKeyFormats">recognized key
- format value</a>, then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-SyntaxError"><code>SyntaxError</code></a>.
+ If <var>format</var> is not a <a href="#dfn-RecognizedKeyFormats">recognized key
+ format value</a>, then <a href="#concept-return-an-error">return an error</a>
+ named <a href="#dfn-SyntaxError"><code>SyntaxError</code></a>.
</p>
</li>
<li>
@@ -2216,8 +2218,8 @@
<p>
Let <var>result</var> be the result of performing the wrap key operation
specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
- <var>wrappingKey</var>
- as <var>key</var> and <var>bytes</var> as <var>plaintext</var>.
+ <var>wrappingKey</var> as <var>key</var> and <var>bytes</var> as
+ <var>plaintext</var>.
</p>
</dd>
<dt>Otherwise, if <var>normalizedAlgorithm</var> supports the encrypt operation:</dt>
@@ -2225,8 +2227,8 @@
<p>
Let <var>result</var> be the result of performing the encrypt operation
specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
- <var>wrappingKey</var>
- as <var>key</var> and <var>bytes</var> as <var>plaintext</var>.
+ <var>wrappingKey</var> as <var>key</var> and <var>bytes</var> as
+ <var>plaintext</var>.
</p>
</dd>
<dt>Otherwise:</dt>
@@ -2359,11 +2361,10 @@
</li>
<li>
<dl class="switch">
- <dt>If <var>normalizedUnwrapAlgorithm</var> supports an unwrap key operation:</dt>
+ <dt>If <var>normalizedAlgorithm</var> supports an unwrap key operation:</dt>
<dd>
Let <var>bytes</var> be the result of performing the unwrap key operation
- specified by <var>normalizedAlgorithm</var> using
- <var>algorithm</var>,
+ specified by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
<var>unwrappingKey</var> as <var>key</var> and <var>wrappedKey</var> as
<var>ciphertext</var>.
</dd>
@@ -2372,9 +2373,8 @@
operation:
</dt>
<dd>
- Let <var>bytes</var> be the result of performing the decrypt operation
- specified by <var>normalizedAlgorithm</var> using
- <var>algorithm</var>,
+ Let <var>bytes</var> be the result of performing the decrypt operation specified
+ by <var>normalizedAlgorithm</var> using <var>algorithm</var>,
<var>unwrappingKey</var> as <var>key</var> and <var>wrappedKey</var> as
<var>ciphertext</var>.
</dd>
@@ -2424,7 +2424,7 @@
</tr>
<tr>
<td><dfn id="dfn-SyntaxError"><code>SyntaxError</code></dfn></td>
- <td>A required parameter was missing our out-of-range</td>
+ <td>A required parameter was missing or out-of-range</td>
</tr>
<tr>
<td><dfn id="dfn-InvalidStateError"><code>InvalidStateError</code></dfn></td>