--- 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
@@ -747,9 +747,9 @@
<p>
When this specification says to calculate the <dfn id="concept-usage-intersection">usage
intersection</dfn> of two arrays, <var>a</var> and <var>b</var> the result shall be an
- array containing each <a href="#dfn-RecognizedKeyUsage">recognised key usage value</a>
+ array containing each <a href="#dfn-RecognizedKeyUsage">recognized key usage value</a>
that appears in both <var>a</var> and <var>b</var>, in the order listed in the list of
- <a href="#dfn-RecognizedKeyUsage">recognised key usage values</a>, where a value is said
+ <a href="#dfn-RecognizedKeyUsage">recognized key usage values</a>, where a value is said
to appear in an array if an element of the array exists that is a case-sensistive string
match for that value.
</p>
@@ -757,7 +757,7 @@
When this specification says to calculate the <dfn id="concept-normalized-usages">
normalized value of a usages list</dfn>, <var>usages</var> the result shall be the
<a href="#concept-usage-intersection">usage intersection</a> of <var>usages</var> and an
- array containing all <a href="#dfn-RecognizedKeyUsage">recognised key usage values</a>.
+ array containing all <a href="#dfn-RecognizedKeyUsage">recognized key usage values</a>.
</p>
</div>
@@ -2192,7 +2192,7 @@
<li>
<p>
If the algorithm identified by the <a href="#dfn-Key-algorithm">algorithm</a>
- attibute of <var>key</var> does not support the export key operation,
+ attribute of <var>key</var> does not support the export key operation,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
@@ -3087,7 +3087,7 @@
</li>
<li>
<p>
- Perform the encrytion operation defined in Section 7.2 of [<cite><a
+ Perform the encryption operation defined in Section 7.2 of [<cite><a
href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
as the recipient's RSA public key and the
<a href="#concept-contents-of-arraybuffer">contents of <var>plaintext</var></a>
@@ -6511,7 +6511,7 @@
</li>
<li>
<p>
- Perform the encrytion operation defined in Section 7.1 of [<cite><a
+ Perform the encryption operation defined in Section 7.1 of [<cite><a
href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
as the recipient's RSA public key, the <a
href="#concept-contents-of-arraybuffer">contents of <var>plaintext</var></a>
@@ -8053,7 +8053,7 @@
<p>
Perform the ECDSA verifying process, as specified in <a
href="#X9.62">X9.62</a>, Section 7.4, with <var>M</var> as the received
- message, <var>signatire</var> as the received signature and using
+ message, <var>signature</var> as the received signature and using
<var>params</var> as the EC domain parameters, and
<var>Q</var> as the public key.
</p>
@@ -8100,7 +8100,7 @@
</li>
<li>
<p>
- Generate an Eliptic Curve key pair, as defined in [<a href="#X9.62">X9.62</a>]
+ Generate an Elliptic Curve key pair, as defined in [<a href="#X9.62">X9.62</a>]
with domain parameters for the curve identified by
the <a href="#dfn-EcKeyGenParams-namedCurve">namedCurve</a> member of
<var>normalizedAlgorithm</var>.
@@ -9003,7 +9003,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -9338,7 +9338,7 @@
<li>
<p>
Let <var>secret</var> be the result of applying the field element to
- octet string comversion defined in Section ? of <a href="#X9.63">X9.63</a>
+ octet string conversion defined in Section ? of <a href="#X9.63">X9.63</a>
to the output of the ECDH primitive.
</p>
</li>
@@ -10243,7 +10243,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -10458,7 +10458,7 @@
<var>normalizedAlgorithm</var> as the initial value of the counter block, the
<a href="#dfn-AesCtrParams-length">length</a> member of
<var>normalizedAlgorithm</var> as the input parameter <var>m</var> to the
- standard counter block incrementing functon defined in Appendix B.1 of NIST SP
+ standard counter block incrementing function defined in Appendix B.1 of NIST SP
800-38A [<a href="#SP800-38A">SP800-38A</a>] and <a
href="#concept-contents-of-arraybuffer">the contents of
<var>plaintext</var></a> as the input plaintext.
@@ -10517,7 +10517,7 @@
<var>normalizedAlgorithm</var> as the initial value of the counter block, the
<a href="#dfn-AesCtrParams-length">length</a> member of
<var>normalizedAlgorithm</var> as the input parameter <var>m</var> to the
- standard counter block incrementing functon defined in Appendix B.1 of NIST SP
+ standard counter block incrementing function defined in Appendix B.1 of NIST SP
800-38A [<a href="#SP800-38A">SP800-38A</a>] and <a
href="#concept-contents-of-arraybuffer">the contents of
<var>ciphertext</var></a> as the input ciphertext.
@@ -10830,7 +10830,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -10867,7 +10867,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -11039,7 +11039,7 @@
</li>
<li>
<p>
- Let <var>padded-plaintext</var> be the result of adding padding octets to
+ Let <var>paddedPlaintext</var> be the result of adding padding octets to
<var>ciphertext</var> according to the procedure defined in Section 10.3
of RFC 2315 [<a href="#RFC2315">RFC2315</a>], step 2, with a value of
<var>k</var> of 16.
@@ -11054,7 +11054,7 @@
href="#dfn-AesCbcParams-iv">iv</a> member of <var>normalizedAlgorithm</var> as
the <var>IV</var> input parameter and <a
href="#concept-contents-of-arraybuffer">the contents of
- <var>padded-plaintext</var></a> as the input plaintext.
+ <var>paddedPlaintext</var></a> as the input plaintext.
</p>
</li>
<li>
@@ -11093,7 +11093,7 @@
</li>
<li>
<p>
- Let <var>padded-plaintext</var> be the result of performing the CBC Decryption
+ Let <var>paddedPlaintext</var> be the result of performing the CBC Decryption
operation described in Section 6.2 of NIST SP 800-38A [<a
href="#SP800-38A">SP800-38A</a>] using AES as the block cipher, <a
href="#concept-contents-of-arraybuffer">the contents of</a> the <a
@@ -11105,21 +11105,21 @@
</li>
<li>
<p>
- Let <var>p</var> be the value of the last octet of <var>padded-plaintext</var>.
+ Let <var>p</var> be the value of the last octet of <var>paddedPlaintext</var>.
</p>
</li>
<li>
<p>
If <var>p</var> is zero or greater than 16, or if any of the last <var>p</var>
- octets of <var>padded-plaintext</var> have a value which is not <var>p</var>,
+ octets of <var>paddedPlaintext</var> have a value which is not <var>p</var>,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
<p>
- Let <var>plaintext</var> be the result of removing <var>p</var> octents from
- the end of <var>padded-plaintext</var>.
+ Let <var>plaintext</var> be the result of removing <var>p</var> octets from
+ the end of <var>paddedPlaintext</var>.
</p>
</li>
<li>
@@ -11430,7 +11430,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -11467,7 +11467,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -11660,7 +11660,7 @@
</li>
<li>
<p>
- Let <var>ouput</var> be the result of performing the MAC Verification
+ Let <var>output</var> be the result of performing the MAC Verification
operation described in Section 6.3 of
NIST SP 800-38B [<a href="#SP800-38B">SP800-38B</a>] using AES as the block
cipher, <var>length</var> as the value of the MAC length parameter,
@@ -11974,7 +11974,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -12011,7 +12011,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -12335,7 +12335,7 @@
href="#concept-contents-of-arraybuffer">the contents of
<var>actualCiphertext</var></a> as the input ciphertext, <var>C</var> and <a
href="#concept-contents-of-arraybuffer">the contents of <var>tag</var></a> as
- the authentation tag, <var>T</var>.
+ the authentication tag, <var>T</var>.
</p>
<dl class="switch">
<dt>If the result of the algorithm is the indication of inauthenticity,
@@ -12657,7 +12657,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -12694,7 +12694,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -13261,7 +13261,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -13768,7 +13768,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -14538,7 +14538,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -14943,10 +14943,10 @@
</li>
<li>
<p>
- Perform the Diffie Hellman Phase II algorithm as specified in
+ Perform the Diffie-Hellman Phase II algorithm as specified in
Section 8 of [<a href="#PKCS3">PKCS #3</a>]
with <var>key</var> as the DH private value <var>x</var> and the
- Diffie Hellman public value represented by the
+ Diffie-Hellman public value represented by the
<a href="#dfn-DhKeyDeriveParams-public">public</a> member of
<var>normalizedAlgorithm</var> as the other's public value <var>PV'</var>.
</p>
@@ -15104,7 +15104,7 @@
</li>
<li>
<p>
- If an error occured while parsing,
+ If an error occurred while parsing,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
@@ -15152,7 +15152,7 @@
</li>
<li>
<p>
- Set the <a href="#dfn-Key-type">type</a> propety of <var>key</var> to
+ Set the <a href="#dfn-Key-type">type</a> property of <var>key</var> to
<code>"public"</code>.
</p>
</li>
@@ -15611,7 +15611,7 @@
<dl class="switch">
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-1"</code>:
</dt>
<dd>
@@ -15621,7 +15621,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-256"</code>:
</dt>
<dd>
@@ -15631,7 +15631,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-384"</code>:
</dt>
<dd>
@@ -15641,7 +15641,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-512"</code>:
</dt>
<dd>
@@ -15754,7 +15754,7 @@
<li>
<p>
Let <var>secret</var> be the result of performing the Concatenation Key
- Derivation Funtion defined in Section 5.8.1 of
+ Derivation Function defined in Section 5.8.1 of
[<a href="#SP800-56A">SP800-56A</a>] with <var>length</var> as
<var>keydatalen</var>, the hash function identified by the
<a href="#dfn-ConcatParams-hash">hash</a> member of
@@ -15925,7 +15925,7 @@
<h4>HkdfCtrParams dictionary</h4>
<x:codeblock language="idl">
dictionary <dfn id="dfn-HkdfCtrParams">HkdfCtrParams</dfn> : <a href="#dfn-Algorithm">Algorithm</a> {
- <span class="comment">// The algorithm to use with HMAC (eg: <a href="#sha-256">SHA-256</a>)</span>
+ <span class="comment">// The algorithm to use with HMAC (e.g.: <a href="#sha-256">SHA-256</a>)</span>
AlgorithmIdentifier <dfn id="dfn-HkdfCtrParams-hash">hash</dfn>;
<span class="comment">// A bit string that corresponds to the label that identifies the purpose for the derived keying material.</span>
CryptoOperationData <dfn id="dfn-HkdfCtrParams-label">label</dfn>;
@@ -15940,7 +15940,7 @@
supplied, an all zero string is used instead. However, support for an explicit
salt value is not widely implemented in existing APIs, nor is it required by
existing usages of HKDF. Should this be an optional parameter, and if so, what
- should the behaviour be of a user agent that does not support explicit salt
+ should the behavior be of a user agent that does not support explicit salt
values (is it conforming or non-conforming?)
</p>
</div>
@@ -15977,7 +15977,7 @@
<p>
If the <a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
- recognised algorithm</a> that supports the digest operation, then
+ recognized algorithm</a> that supports the digest operation, then
<a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
@@ -15985,7 +15985,7 @@
<li>
<p>
Let <var>extractKey</var> be a key equal to <var>n</var> zero bits where
- <var>n</var> is the size of the output of the hash fuction described by the
+ <var>n</var> is the size of the output of the hash function described by the
<a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var>.
</p>
@@ -16258,7 +16258,7 @@
<p>
If the <a href="#dfn-Pbkdf2Params-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
- recognised algorithm</a> that supports the digest operation, then
+ recognized algorithm</a> that supports the digest operation, then
<a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
@@ -16602,7 +16602,7 @@
iv: window.crypto.getRandomValues(new Uint8Array(16))
};
-<span class="comment">// Create a keygenerator to produce a one-time-use AES key to encrypt some data</span>
+<span class="comment">// Create a key generator to produce a one-time-use AES key to encrypt some data</span>
window.crypto.subtle.generateKey(aesAlgorithmKeyGen, false, ["encrypt"]).then(
function(aesKey) {
return window.crypto.subtle.encrypt(aesAlgorithmEncrypt, aesKey, [ clearDataArrayBufferView ]);
--- a/spec/Overview.html Mon Jun 16 00:00:00 2014 -0700
+++ b/spec/Overview.html Mon Jun 16 00:00:00 2014 -0700
@@ -755,9 +755,9 @@
<p>
When this specification says to calculate the <dfn id="concept-usage-intersection">usage
intersection</dfn> of two arrays, <var>a</var> and <var>b</var> the result shall be an
- array containing each <a href="#dfn-RecognizedKeyUsage">recognised key usage value</a>
+ array containing each <a href="#dfn-RecognizedKeyUsage">recognized key usage value</a>
that appears in both <var>a</var> and <var>b</var>, in the order listed in the list of
- <a href="#dfn-RecognizedKeyUsage">recognised key usage values</a>, where a value is said
+ <a href="#dfn-RecognizedKeyUsage">recognized key usage values</a>, where a value is said
to appear in an array if an element of the array exists that is a case-sensistive string
match for that value.
</p>
@@ -765,7 +765,7 @@
When this specification says to calculate the <dfn id="concept-normalized-usages">
normalized value of a usages list</dfn>, <var>usages</var> the result shall be the
<a href="#concept-usage-intersection">usage intersection</a> of <var>usages</var> and an
- array containing all <a href="#dfn-RecognizedKeyUsage">recognised key usage values</a>.
+ array containing all <a href="#dfn-RecognizedKeyUsage">recognized key usage values</a>.
</p>
</div>
@@ -2199,7 +2199,7 @@
<li>
<p>
If the algorithm identified by the <a href="#dfn-Key-algorithm">algorithm</a>
- attibute of <var>key</var> does not support the export key operation,
+ attribute of <var>key</var> does not support the export key operation,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
@@ -3094,7 +3094,7 @@
</li>
<li>
<p>
- Perform the encrytion operation defined in Section 7.2 of [<cite><a href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
+ Perform the encryption operation defined in Section 7.2 of [<cite><a href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
as the recipient's RSA public key and the
<a href="#concept-contents-of-arraybuffer">contents of <var>plaintext</var></a>
as <var>M</var>.
@@ -6419,7 +6419,7 @@
</li>
<li>
<p>
- Perform the encrytion operation defined in Section 7.1 of [<cite><a href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
+ Perform the encryption operation defined in Section 7.1 of [<cite><a href="#RFC3447">RFC3447</a></cite>] with the key represented by <var>key</var>
as the recipient's RSA public key, the <a href="#concept-contents-of-arraybuffer">contents of <var>plaintext</var></a>
as the message to be encrypted, <var>M</var> and the <a href="#concept-contents-of-arraybuffer">contents of</a> <a href="#dfn-RsaOaepParams-label">label</a> member of
<var>normalizedAlgorithm</var> as the label, <var>L</var>, and with the hash
@@ -7899,7 +7899,7 @@
<li>
<p>
Perform the ECDSA verifying process, as specified in <a href="#X9.62">X9.62</a>, Section 7.4, with <var>M</var> as the received
- message, <var>signatire</var> as the received signature and using
+ message, <var>signature</var> as the received signature and using
<var>params</var> as the EC domain parameters, and
<var>Q</var> as the public key.
</p>
@@ -7946,7 +7946,7 @@
</li>
<li>
<p>
- Generate an Eliptic Curve key pair, as defined in [<a href="#X9.62">X9.62</a>]
+ Generate an Elliptic Curve key pair, as defined in [<a href="#X9.62">X9.62</a>]
with domain parameters for the curve identified by
the <a href="#dfn-EcKeyGenParams-namedCurve">namedCurve</a> member of
<var>normalizedAlgorithm</var>.
@@ -8832,7 +8832,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -9166,7 +9166,7 @@
<li>
<p>
Let <var>secret</var> be the result of applying the field element to
- octet string comversion defined in Section ? of <a href="#X9.63">X9.63</a>
+ octet string conversion defined in Section ? of <a href="#X9.63">X9.63</a>
to the output of the ECDH primitive.
</p>
</li>
@@ -10054,7 +10054,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -10265,7 +10265,7 @@
<var>normalizedAlgorithm</var> as the initial value of the counter block, the
<a href="#dfn-AesCtrParams-length">length</a> member of
<var>normalizedAlgorithm</var> as the input parameter <var>m</var> to the
- standard counter block incrementing functon defined in Appendix B.1 of NIST SP
+ standard counter block incrementing function defined in Appendix B.1 of NIST SP
800-38A [<a href="#SP800-38A">SP800-38A</a>] and <a href="#concept-contents-of-arraybuffer">the contents of
<var>plaintext</var></a> as the input plaintext.
</p>
@@ -10320,7 +10320,7 @@
<var>normalizedAlgorithm</var> as the initial value of the counter block, the
<a href="#dfn-AesCtrParams-length">length</a> member of
<var>normalizedAlgorithm</var> as the input parameter <var>m</var> to the
- standard counter block incrementing functon defined in Appendix B.1 of NIST SP
+ standard counter block incrementing function defined in Appendix B.1 of NIST SP
800-38A [<a href="#SP800-38A">SP800-38A</a>] and <a href="#concept-contents-of-arraybuffer">the contents of
<var>ciphertext</var></a> as the input ciphertext.
</p>
@@ -10632,7 +10632,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -10669,7 +10669,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -10841,7 +10841,7 @@
</li>
<li>
<p>
- Let <var>padded-plaintext</var> be the result of adding padding octets to
+ Let <var>paddedPlaintext</var> be the result of adding padding octets to
<var>ciphertext</var> according to the procedure defined in Section 10.3
of RFC 2315 [<a href="#RFC2315">RFC2315</a>], step 2, with a value of
<var>k</var> of 16.
@@ -10852,7 +10852,7 @@
Let <var>ciphertext</var> be the result of performing the CBC Encryption
operation described in Section 6.2 of NIST SP 800-38A [<a href="#SP800-38A">SP800-38A</a>] using AES as the block cipher, <a href="#concept-contents-of-arraybuffer">the contents of</a> the <a href="#dfn-AesCbcParams-iv">iv</a> member of <var>normalizedAlgorithm</var> as
the <var>IV</var> input parameter and <a href="#concept-contents-of-arraybuffer">the contents of
- <var>padded-plaintext</var></a> as the input plaintext.
+ <var>paddedPlaintext</var></a> as the input plaintext.
</p>
</li>
<li>
@@ -10891,7 +10891,7 @@
</li>
<li>
<p>
- Let <var>padded-plaintext</var> be the result of performing the CBC Decryption
+ Let <var>paddedPlaintext</var> be the result of performing the CBC Decryption
operation described in Section 6.2 of NIST SP 800-38A [<a href="#SP800-38A">SP800-38A</a>] using AES as the block cipher, <a href="#concept-contents-of-arraybuffer">the contents of</a> the <a href="#dfn-AesCbcParams-iv">iv</a> member of <var>normalizedAlgorithm</var> as
the <var>IV</var> input parameter and <a href="#concept-contents-of-arraybuffer">the contents of
<var>ciphertext</var></a> as the input ciphertext.
@@ -10899,21 +10899,21 @@
</li>
<li>
<p>
- Let <var>p</var> be the value of the last octet of <var>padded-plaintext</var>.
+ Let <var>p</var> be the value of the last octet of <var>paddedPlaintext</var>.
</p>
</li>
<li>
<p>
If <var>p</var> is zero or greater than 16, or if any of the last <var>p</var>
- octets of <var>padded-plaintext</var> have a value which is not <var>p</var>,
+ octets of <var>paddedPlaintext</var> have a value which is not <var>p</var>,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
<p>
- Let <var>plaintext</var> be the result of removing <var>p</var> octents from
- the end of <var>padded-plaintext</var>.
+ Let <var>plaintext</var> be the result of removing <var>p</var> octets from
+ the end of <var>paddedPlaintext</var>.
</p>
</li>
<li>
@@ -11224,7 +11224,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -11261,7 +11261,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -11454,7 +11454,7 @@
</li>
<li>
<p>
- Let <var>ouput</var> be the result of performing the MAC Verification
+ Let <var>output</var> be the result of performing the MAC Verification
operation described in Section 6.3 of
NIST SP 800-38B [<a href="#SP800-38B">SP800-38B</a>] using AES as the block
cipher, <var>length</var> as the value of the MAC length parameter,
@@ -11768,7 +11768,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -11805,7 +11805,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -12117,7 +12117,7 @@
<var>additionalData</var></a> as the <var>A</var> input parameter,
<var>tagLength</var> as the <var>t</var> pre-requisite, <a href="#concept-contents-of-arraybuffer">the contents of
<var>actualCiphertext</var></a> as the input ciphertext, <var>C</var> and <a href="#concept-contents-of-arraybuffer">the contents of <var>tag</var></a> as
- the authentation tag, <var>T</var>.
+ the authentication tag, <var>T</var>.
</p>
<dl class="switch">
<dt>If the result of the algorithm is the indication of inauthenticity,
@@ -12439,7 +12439,7 @@
<li>
<p>
Set the <code>k</code> property of <var>jwk</var> to be a string
- containng the raw octets
+ containing the raw octets
of the key represented by <var>key</var>, encoded according to
Section 6.4 of <a href="#jwa">JSON Web Algorithms</a>.
</p>
@@ -12476,7 +12476,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -13037,7 +13037,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -13544,7 +13544,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -14314,7 +14314,7 @@
<li>
<p>
Let <var>stringifiedJwk</var> be the result of encoding <var>jwk</var>
- into a string according to the grammer specified in Section 15.12 of
+ into a string according to the grammar specified in Section 15.12 of
<a href="#ECMA-262">ECMA262</a>.
</p>
</li>
@@ -14718,10 +14718,10 @@
</li>
<li>
<p>
- Perform the Diffie Hellman Phase II algorithm as specified in
+ Perform the Diffie-Hellman Phase II algorithm as specified in
Section 8 of [<a href="#PKCS3">PKCS #3</a>]
with <var>key</var> as the DH private value <var>x</var> and the
- Diffie Hellman public value represented by the
+ Diffie-Hellman public value represented by the
<a href="#dfn-DhKeyDeriveParams-public">public</a> member of
<var>normalizedAlgorithm</var> as the other's public value <var>PV'</var>.
</p>
@@ -14872,7 +14872,7 @@
</li>
<li>
<p>
- If an error occured while parsing,
+ If an error occurred while parsing,
then <a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
@@ -14920,7 +14920,7 @@
</li>
<li>
<p>
- Set the <a href="#dfn-Key-type">type</a> propety of <var>key</var> to
+ Set the <a href="#dfn-Key-type">type</a> property of <var>key</var> to
<code>"public"</code>.
</p>
</li>
@@ -15368,7 +15368,7 @@
<dl class="switch">
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-1"</code>:
</dt>
<dd>
@@ -15378,7 +15378,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-256"</code>:
</dt>
<dd>
@@ -15388,7 +15388,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-384"</code>:
</dt>
<dd>
@@ -15398,7 +15398,7 @@
</dd>
<dt>
If the <a href="#dfn-Algorithm-name">name</a> member of
- <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+ <var>normalizedAlgorithm</var> is a cases-sensitive string match for
<code>"SHA-512"</code>:
</dt>
<dd>
@@ -15511,7 +15511,7 @@
<li>
<p>
Let <var>secret</var> be the result of performing the Concatenation Key
- Derivation Funtion defined in Section 5.8.1 of
+ Derivation Function defined in Section 5.8.1 of
[<a href="#SP800-56A">SP800-56A</a>] with <var>length</var> as
<var>keydatalen</var>, the hash function identified by the
<a href="#dfn-ConcatParams-hash">hash</a> member of
@@ -15682,7 +15682,7 @@
<h4>18.20.3. HkdfCtrParams dictionary</h4>
<div class="block"><div class="blockTitleDiv"><span class="blockTitle">IDL</span></div><div class="blockContent"><pre class="code"><code class="idl-code">
dictionary <dfn id="dfn-HkdfCtrParams">HkdfCtrParams</dfn> : <a href="#dfn-Algorithm">Algorithm</a> {
- <span class="comment">// The algorithm to use with HMAC (eg: <a href="#sha-256">SHA-256</a>)</span>
+ <span class="comment">// The algorithm to use with HMAC (e.g.: <a href="#sha-256">SHA-256</a>)</span>
AlgorithmIdentifier <dfn id="dfn-HkdfCtrParams-hash">hash</dfn>;
<span class="comment">// A bit string that corresponds to the label that identifies the purpose for the derived keying material.</span>
CryptoOperationData <dfn id="dfn-HkdfCtrParams-label">label</dfn>;
@@ -15697,7 +15697,7 @@
supplied, an all zero string is used instead. However, support for an explicit
salt value is not widely implemented in existing APIs, nor is it required by
existing usages of HKDF. Should this be an optional parameter, and if so, what
- should the behaviour be of a user agent that does not support explicit salt
+ should the behavior be of a user agent that does not support explicit salt
values (is it conforming or non-conforming?)
</p>
</div>
@@ -15734,7 +15734,7 @@
<p>
If the <a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
- recognised algorithm</a> that supports the digest operation, then
+ recognized algorithm</a> that supports the digest operation, then
<a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
@@ -15742,7 +15742,7 @@
<li>
<p>
Let <var>extractKey</var> be a key equal to <var>n</var> zero bits where
- <var>n</var> is the size of the output of the hash fuction described by the
+ <var>n</var> is the size of the output of the hash function described by the
<a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var>.
</p>
@@ -16013,7 +16013,7 @@
<p>
If the <a href="#dfn-Pbkdf2Params-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
- recognised algorithm</a> that supports the digest operation, then
+ recognized algorithm</a> that supports the digest operation, then
<a href="#concept-return-an-error">return an error</a> named
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
@@ -16354,7 +16354,7 @@
iv: window.crypto.getRandomValues(new Uint8Array(16))
};
-<span class="comment">// Create a keygenerator to produce a one-time-use AES key to encrypt some data</span>
+<span class="comment">// Create a key generator to produce a one-time-use AES key to encrypt some data</span>
window.crypto.subtle.generateKey(aesAlgorithmKeyGen, false, ["encrypt"]).then(
function(aesKey) {
return window.crypto.subtle.encrypt(aesAlgorithmEncrypt, aesKey, [ clearDataArrayBufferView ]);