Skip to content

Commit

Permalink
Fix #119: Remove redundant checks that hash algorithm is supported (#123
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@mwatson2
mwatson2 authored Aug 26, 2016
1 parent 4f58244 commit 87c77ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 74 deletions.
36 changes: 0 additions & 36 deletions spec/Overview-WebCryptoAPI.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8304,15 +8304,6 @@ dictionary <dfn id="dfn-EcKeyImportParams">EcKeyImportParams</dfn> : <a href="#d
member of <var>normalizedAlgorithm</var>.
</p>
</li>
<li>
<p>
If <var>hashAlgorithm</var> does not describe a
<a href="#algorithms">registered algorithm</a> that supports the digest
operation,
then <a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
</li>
<li>
<p>
Let <var>M</var> be the result of performing the digest operation specified by
Expand Down Expand Up @@ -8419,15 +8410,6 @@ dictionary <dfn id="dfn-EcKeyImportParams">EcKeyImportParams</dfn> : <a href="#d
<var>normalizedAlgorithm</var>.
</p>
</li>
<li>
<p>
If <var>hashAlgorithm</var> does not describe a
<a href="#algorithms">registered algorithm</a> that supports the digest
operation,
then <a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
</li>
<li>
<p>
Let <var>M</var> be the result of performing the digest operation specified by
Expand Down Expand Up @@ -14752,15 +14734,6 @@ dictionary <dfn id="dfn-HkdfCtrParams">HkdfCtrParams</dfn> : <a href="#dfn-Algor
If <var>length</var> is null, then <a href="#concept-throw">throw</a> an <a href="#dfn-OperationError"><code>OperationError</code></a>.
</p>
</li>
<li>
<p>
If the <a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
recognized algorithm</a> that supports the digest operation, then
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
</li>
<li>
<p>
Let <var>extractKey</var> be a key equal to <var>n</var> zero bits where
Expand Down Expand Up @@ -15019,15 +14992,6 @@ dictionary <dfn id="dfn-Pbkdf2Params">Pbkdf2Params</dfn> : <a href="#dfn-Algorit
href="#dfn-OperationError"><code>OperationError</code></a>.
</p>
</li>
<li>
<p>
If the <a href="#dfn-Pbkdf2Params-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
recognized algorithm</a> that supports the digest operation, then
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
</li>
<li>
<p>
Let <var>prf</var> be the MAC Generation function described in Section 4 of
Expand Down
40 changes: 2 additions & 38 deletions spec/Overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<link rel="stylesheet" href="//www.w3.org/StyleSheets/TR/2016/W3C-ED" type="text/css" /></head>

<body>
<div class="head"><p><a class="logo" href="http://www.w3.org/"><img src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72" height="48" alt="W3C" /></a></p><h1>Web Cryptography API</h1><h2>W3C Editor’s Draft <em>19 July 2016</em></h2><dl><dt>Latest Editor’s Draft:</dt><dd><a href="http://w3c.github.io/webcrypto/Overview.html">http://w3c.github.io/webcrypto/Overview.html</a></dd><dt>Latest Published Version:</dt><dd><a href="http://www.w3.org/TR/WebCryptoAPI/">http://www.w3.org/TR/WebCryptoAPI/</a></dd><dt>Previous Version(s):</dt><dd><a href="https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html">https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html</a></dd><dt>Editor:</dt><dd><a href="http://www.netflix.com/">Mark Watson</a>, Netflix &lt;[email protected]&gt;</dd><dt>Participate:</dt><dd><a href="https://github.com/w3c/webcrypto">We are on GitHub</a>.
<div class="head"><p><a class="logo" href="http://www.w3.org/"><img src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72" height="48" alt="W3C" /></a></p><h1>Web Cryptography API</h1><h2>W3C Editor’s Draft <em>26 August 2016</em></h2><dl><dt>Latest Editor’s Draft:</dt><dd><a href="http://w3c.github.io/webcrypto/Overview.html">http://w3c.github.io/webcrypto/Overview.html</a></dd><dt>Latest Published Version:</dt><dd><a href="http://www.w3.org/TR/WebCryptoAPI/">http://www.w3.org/TR/WebCryptoAPI/</a></dd><dt>Previous Version(s):</dt><dd><a href="https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html">https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html</a></dd><dt>Editor:</dt><dd><a href="http://www.netflix.com/">Mark Watson</a>, Netflix &lt;[email protected]&gt;</dd><dt>Participate:</dt><dd><a href="https://github.com/w3c/webcrypto">We are on GitHub</a>.
</dd><dd>
Send feedback to <a href="mailto:[email protected]?subject=%5BWebCryptoAPI%5D">[email protected]</a> (<a href="http://lists.w3.org/Archives/Public/public-webcrypto/">archives</a>).
</dd><dd><a href="https://github.com/w3c/webcrypto/issues/new">File a bug</a>
Expand Down Expand Up @@ -60,7 +60,7 @@ <h2>Status of this Document</h2>
report can be found in the <a href="http://www.w3.org/TR/">W3C technical
reports index</a> at http://www.w3.org/TR/.
</em></p><p>
This document is the 19 July 2016 <b>Editor’s Draft</b> of the
This document is the 26 August 2016 <b>Editor’s Draft</b> of the
<cite>Web Cryptography API</cite> specification.

Please send comments about this document to
Expand Down Expand Up @@ -8061,15 +8061,6 @@ <h4>23.7. Operations</h4>
member of <var>normalizedAlgorithm</var>.
</p>
</li>
<li>
<p>
If <var>hashAlgorithm</var> does not describe a
<a href="#algorithms">registered algorithm</a> that supports the digest
operation,
then <a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
</li>
<li>
<p>
Let <var>M</var> be the result of performing the digest operation specified by
Expand Down Expand Up @@ -8174,15 +8165,6 @@ <h4>23.7. Operations</h4>
<var>normalizedAlgorithm</var>.
</p>
</li>
<li>
<p>
If <var>hashAlgorithm</var> does not describe a
<a href="#algorithms">registered algorithm</a> that supports the digest
operation,
then <a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
</p>
</li>
<li>
<p>
Let <var>M</var> be the result of performing the digest operation specified by
Expand Down Expand Up @@ -14275,15 +14257,6 @@ <h4>31.4. Operations</h4>
If <var>length</var> is null, then <a href="#concept-throw">throw</a> an <a href="#dfn-OperationError"><code>OperationError</code></a>.
</p>
</li>
<li>
<p>
If the <a href="#dfn-HkdfCtrParams-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
recognized algorithm</a> that supports the digest operation, then
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
</li>
<li>
<p>
Let <var>extractKey</var> be a key equal to <var>n</var> zero bits where
Expand Down Expand Up @@ -14537,15 +14510,6 @@ <h4>32.4. Operations</h4>
If <var>length</var> is null or is not a multiple of 8, then <a href="#concept-throw">throw</a> an <a href="#dfn-OperationError"><code>OperationError</code></a>.
</p>
</li>
<li>
<p>
If the <a href="#dfn-Pbkdf2Params-hash">hash</a> member of
<var>normalizedAlgorithm</var> does not describe a <a href="#algorithms">
recognized algorithm</a> that supports the digest operation, then
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>
</p>
</li>
<li>
<p>
Let <var>prf</var> be the MAC Generation function described in Section 4 of
Expand Down

0 comments on commit 87c77ea

Please sign in to comment.