Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #146: Specify source of data for eliptic curve key import and fix… #148

Merged
merged 1 commit into from
Oct 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions spec/Overview-WebCryptoAPI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8777,15 +8777,16 @@ dictionary <dfn id="dfn-EcKeyImportParams">EcKeyImportParams</dfn> : <a href="#d
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a
href="#SEC1">SEC 1</a>.
href="#SEC1">SEC 1</a> to the <code>subjectPublicKey</code>
field of <var>spki</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</dd>
<dt>Otherwise:</dt>
Expand Down Expand Up @@ -9364,7 +9365,7 @@ dictionary <dfn id="dfn-EcKeyImportParams">EcKeyImportParams</dfn> : <a href="#d
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a
href="#SEC1">SEC 1</a>.
href="#SEC1">SEC 1</a> to <var>keyData</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
Expand Down Expand Up @@ -10475,15 +10476,16 @@ dictionary <dfn id="dfn-EcdhKeyDeriveParams">EcdhKeyDeriveParams</dfn> : <a href
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a
href="#SEC1">SEC 1</a>.
href="#SEC1">SEC 1</a> to the <code>subjectPublicKey</code>
field of <var>spki</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</dd>
<dt>Otherwise:</dt>
Expand Down Expand Up @@ -11014,15 +11016,15 @@ dictionary <dfn id="dfn-EcdhKeyDeriveParams">EcdhKeyDeriveParams</dfn> : <a href
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a
href="#SEC1">SEC 1</a>.
href="#SEC1">SEC 1</a> to <var>keyData</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
</ol>
Expand Down
16 changes: 9 additions & 7 deletions spec/Overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -8530,15 +8530,16 @@ <h4>23.7. Operations</h4>
<p>
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a>.
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a> to the <code>subjectPublicKey</code>
field of <var>spki</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</dd>
<dt>Otherwise:</dt>
Expand Down Expand Up @@ -9081,7 +9082,7 @@ <h4>23.7. Operations</h4>
<p>
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a>.
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a> to <var>keyData</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
Expand Down Expand Up @@ -10140,15 +10141,16 @@ <h4>24.4. Operations</h4>
<p>
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a>.
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a> to the <code>subjectPublicKey</code>
field of <var>spki</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</dd>
<dt>Otherwise:</dt>
Expand Down Expand Up @@ -10646,15 +10648,15 @@ <h4>24.4. Operations</h4>
<p>
Let <var>key</var> be a new <a href="#dfn-CryptoKey">CryptoKey</a>
object that represents the Elliptic Curve public key identified by
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a>.
performing the conversion steps defined in Section 2.3.4 of <a href="#SEC1">SEC 1</a> to <var>keyData</var>.
If a decode error occurs or an identity point is found,
<a href="#concept-throw">throw</a> a
<a href="#dfn-DataError"><code>DataError</code></a>.
The uncompressed point format MUST be supported.
If the implementation does not support the compressed point format and
a compressed point is provided,
<a href="#concept-throw">throw</a> a
<a href="#dfn-NotSupportedError"><code>NotSupportedError</code></a>.
<a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
</ol>
Expand Down