From 4cf13fdb7b9f2b60695f26044a234c18d0fa734d Mon Sep 17 00:00:00 2001
From: Mark Watson <watsonm@netflix.com>
Date: Tue, 13 Sep 2016 11:52:14 -0700
Subject: [PATCH] Fix #146: Specify source of data for eliptic curve key import
 and fix error type

---
 spec/Overview-WebCryptoAPI.xml | 16 +++++++++-------
 spec/Overview.html             | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/spec/Overview-WebCryptoAPI.xml b/spec/Overview-WebCryptoAPI.xml
index d7aecc7..ca723b7 100644
--- a/spec/Overview-WebCryptoAPI.xml
+++ b/spec/Overview-WebCryptoAPI.xml
@@ -8777,7 +8777,8 @@ 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>.
@@ -8785,7 +8786,7 @@ dictionary <dfn id="dfn-EcKeyImportParams">EcKeyImportParams</dfn> : <a href="#d
                                 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>
@@ -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>.
@@ -10475,7 +10476,8 @@ 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>.
@@ -10483,7 +10485,7 @@ dictionary <dfn id="dfn-EcdhKeyDeriveParams">EcdhKeyDeriveParams</dfn> : <a href
                                 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>
@@ -11014,7 +11016,7 @@ 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>.
@@ -11022,7 +11024,7 @@ dictionary <dfn id="dfn-EcdhKeyDeriveParams">EcdhKeyDeriveParams</dfn> : <a href
                                     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>
diff --git a/spec/Overview.html b/spec/Overview.html
index a1a729d..b2bb23c 100644
--- a/spec/Overview.html
+++ b/spec/Overview.html
@@ -8530,7 +8530,8 @@ <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>.
@@ -8538,7 +8539,7 @@ <h4>23.7. Operations</h4>
                                 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>
@@ -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>.
@@ -10140,7 +10141,8 @@ <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>.
@@ -10148,7 +10150,7 @@ <h4>24.4. Operations</h4>
                                 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>
@@ -10646,7 +10648,7 @@ <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>.
@@ -10654,7 +10656,7 @@ <h4>24.4. Operations</h4>
                                     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>