Bug 26315: Improve wording of namedCurve data type check in ECDSA / ECDH spki / pkcs8 key import
--- a/spec/Overview-WebCryptoAPI.xml Fri Sep 26 11:38:42 2014 -0700
+++ b/spec/Overview-WebCryptoAPI.xml Fri Sep 26 11:50:02 2014 -0700
@@ -8663,8 +8663,10 @@
</li>
<li>
<p>
- If <var>params</var> is not an instance of the <code>namedCurve</code>
- ASN.1 type defined in <a href="#RFC5480">RFC 5480</a>, then <a
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a
href="#concept-return-an-error">return an error</a> named <a
href="#dfn-DataError"><code>DataError</code></a>.
</p>
@@ -8816,11 +8818,12 @@
</li>
<li>
<p>
- If the <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a
+ href="#concept-return-an-error">return an error</a> named <a
+ href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
@@ -10022,10 +10025,11 @@
<li>
<p>
If <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a
+ href="#concept-return-an-error">return an error</a> named <a
+ href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
@@ -10175,11 +10179,12 @@
</li>
<li>
<p>
- If the <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a
+ href="#concept-return-an-error">return an error</a> named <a
+ href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
--- a/spec/Overview.html Fri Sep 26 11:38:42 2014 -0700
+++ b/spec/Overview.html Fri Sep 26 11:50:02 2014 -0700
@@ -8378,8 +8378,10 @@
</li>
<li>
<p>
- If <var>params</var> is not an instance of the <code>namedCurve</code>
- ASN.1 type defined in <a href="#RFC5480">RFC 5480</a>, then <a href="#concept-return-an-error">return an error</a> named <a href="#dfn-DataError"><code>DataError</code></a>.
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a href="#concept-return-an-error">return an error</a> named <a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
@@ -8523,11 +8525,10 @@
</li>
<li>
<p>
- If the <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a href="#concept-return-an-error">return an error</a> named <a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
@@ -9674,10 +9675,9 @@
<li>
<p>
If <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- then <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a href="#concept-return-an-error">return an error</a> named <a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>
@@ -9822,11 +9822,10 @@
</li>
<li>
<p>
- If the <var>params</var> is not an instance of the
- <code>namedCurve</code> ASN.1 type defined in <a href="#RFC5480">RFC
- 5480</a>,
- <a href="#concept-return-an-error">return an error</a> named
- <a href="#dfn-DataError"><code>DataError</code></a>.
+ If <var>params</var> is not an instance of the
+ <code>ECParameters</code> ASN.1 type defined in
+ <a href="#RFC5480">RFC 5480</a> that specifies a
+ <code>namedCurve</code>, then <a href="#concept-return-an-error">return an error</a> named <a href="#dfn-DataError"><code>DataError</code></a>.
</p>
</li>
<li>