Apply remaining changes

Author: Copilot

test/Test.Ecdh.js

@@ -226,18 +226,9 @@ function ecdhTests() {
     });
 }
 
-var ecdhKeyLengths = {
-    "P-256": 32,
-    "P-384": 48,
-    "P-521": 66,
-    "BN-254": 32,
-    "NUMSP256D1": 32,
-    "NUMSP256T1": 32,
-    "NUMSP384D1": 48,
-    "NUMSP384T1": 48,
-    "NUMSP512D1": 64,
-    "NUMSP512T1": 64
-};
+function ecdhCurveElementLength(namedCurve) {
+    return cryptoECC.curveElementLength(namedCurve);
+}
 
 function ecdhKeyAlg(namedCurve) {
     return {
@@ -250,7 +241,7 @@ var inspectEcdhKey = {
     public: function(keyObj, algorithm, usages, reason) {
 
         var fail = [];
-        var expLenMax = ecdhKeyLengths[algorithm.namedCurve];
+        var expLenMax = ecdhCurveElementLength(algorithm.namedCurve);
         var expLenMin = expLenMax;
 
         // has crv property equal to "P-521"
@@ -309,7 +300,7 @@ var inspectEcdhKey = {
         //     }
         // }
 
-        var expLenMax = ecdhKeyLengths[algorithm.namedCurve];
+        var expLenMax = ecdhCurveElementLength(algorithm.namedCurve);
         var expLenMin = expLenMax;
 
         this.public(keyObj, algorithm, usages, reason);

test/Test.Ecdsa.js

@@ -423,18 +423,9 @@ function ecdsaTests() {
     });
 }
 
-var ecdsaKeyLengths = {
-    "P-256": 32,
-    "P-384": 48,
-    "P-521": 66,
-    "BN-254": 32,
-    "NUMSP256D1": 32,
-    "NUMSP256T1": 32,
-    "NUMSP384D1": 48,
-    "NUMSP384T1": 48,
-    "NUMSP512D1": 64,
-    "NUMSP512T1": 64
-};
+function ecdsaCurveElementLength(namedCurve) {
+    return cryptoECC.curveElementLength(namedCurve);
+}
 
 function ecdsaKeyAlg(curve) {
     return {
@@ -455,7 +446,7 @@ var inspectEcdsaKey = {
 
         var fail = [];
 
-        var expLenMax = ecdsaKeyLengths[algorithm.namedCurve];
+        var expLenMax = ecdsaCurveElementLength(algorithm.namedCurve);
         var expLenMin = expLenMax;
 
         // has crv property equal to "P-521"
@@ -498,7 +489,7 @@ var inspectEcdsaKey = {
     },
     private: function(keyObj, algorithm, usages, reason) {
 
-        var expLenMax = ecdsaKeyLengths[algorithm.namedCurve];
+        var expLenMax = ecdsaCurveElementLength(algorithm.namedCurve);
         var expLenMin = expLenMax;
 
         this.public(keyObj, algorithm, usages, reason);