Bug 195127: Turn off debugging output now that we have the AIX tinderbox

working correctly.

1 files changed, 104 insertions, 23 deletions

diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index 48a7c27ff..fa80fe344 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -943,10 +943,14 @@ seckey_supportedECParams(SECItem *encodedParams)
     oid.data = encodedParams->data + 2;
     tag = SECOID_FindOIDTag(&oid);
 
-    return (((tag >= SEC_OID_ANSIX962_EC_PRIME192V1) 
-	    && (tag <= SEC_OID_ANSIX962_EC_PRIME256V1)) ||
-	    ((tag >= SEC_OID_SECG_EC_SECP112R1)
-		&& (tag <= SEC_OID_SECG_EC_SECP521R1)));
+    return (((tag >= SEC_OID_ANSIX962_EC_PRIME192V1) &&
+	     (tag <= SEC_OID_ANSIX962_EC_PRIME256V1)) ||
+	    ((tag >= SEC_OID_SECG_EC_SECP112R1) &&
+	     (tag <= SEC_OID_SECG_EC_SECP521R1)) ||
+	    ((tag >= SEC_OID_ANSIX962_EC_C2PNB163V1) &&
+	     (tag <= SEC_OID_ANSIX962_EC_C2TNB431R1)) ||
+	    ((tag >= SEC_OID_SECG_EC_SECT113R1) &&
+	     (tag <= SEC_OID_SECG_EC_SECT571R1)));
 }
 
 static int
@@ -1177,39 +1181,116 @@ seckey_ECParams2KeySize(SECItem *encodedParams)
     oid.data = encodedParams->data + 2;
     if ((tag = SECOID_FindOIDTag(&oid)) == SEC_OID_UNKNOWN)
 	return 0;
-    switch (tag) {
-    case SEC_OID_ANSIX962_EC_PRIME192V1:
-    case SEC_OID_ANSIX962_EC_PRIME192V2:
-    case SEC_OID_ANSIX962_EC_PRIME192V3:
-	    return 192;
-    case SEC_OID_ANSIX962_EC_PRIME239V1:
-    case SEC_OID_ANSIX962_EC_PRIME239V2:
-    case SEC_OID_ANSIX962_EC_PRIME239V3:
-	    return 239;
-    case SEC_OID_ANSIX962_EC_PRIME256V1:
-	    return 256;
 
+    switch (tag) {
     case SEC_OID_SECG_EC_SECP112R1:
     case SEC_OID_SECG_EC_SECP112R2:
-	    return 112;
+        return 112;
+
+    case SEC_OID_SECG_EC_SECT113R1:
+    case SEC_OID_SECG_EC_SECT113R2:
+	return 113;
+
     case SEC_OID_SECG_EC_SECP128R1:
     case SEC_OID_SECG_EC_SECP128R2:
-	    return 128;
+	return 128;
+
+    case SEC_OID_SECG_EC_SECT131R1:
+    case SEC_OID_SECG_EC_SECT131R2:
+	return 131;
+
     case SEC_OID_SECG_EC_SECP160K1:
     case SEC_OID_SECG_EC_SECP160R1:
     case SEC_OID_SECG_EC_SECP160R2:
-	    return 160;
+	return 160;
+
+    case SEC_OID_SECG_EC_SECT163K1:
+    case SEC_OID_SECG_EC_SECT163R1:
+    case SEC_OID_SECG_EC_SECT163R2:
+    case SEC_OID_ANSIX962_EC_C2PNB163V1:
+    case SEC_OID_ANSIX962_EC_C2PNB163V2:
+    case SEC_OID_ANSIX962_EC_C2PNB163V3:
+	return 163;
+
+    case SEC_OID_ANSIX962_EC_C2PNB176V1:
+	return 176;
+
+    case SEC_OID_ANSIX962_EC_C2TNB191V1:
+    case SEC_OID_ANSIX962_EC_C2TNB191V2:
+    case SEC_OID_ANSIX962_EC_C2TNB191V3:
+    case SEC_OID_ANSIX962_EC_C2ONB191V4:
+    case SEC_OID_ANSIX962_EC_C2ONB191V5:
+	return 191;
+
     case SEC_OID_SECG_EC_SECP192K1:
-	    return 192;
+    case SEC_OID_ANSIX962_EC_PRIME192V1:
+    case SEC_OID_ANSIX962_EC_PRIME192V2:
+    case SEC_OID_ANSIX962_EC_PRIME192V3:
+	return 192;
+
+    case SEC_OID_SECG_EC_SECT193R1:
+    case SEC_OID_SECG_EC_SECT193R2:
+	return 193;
+
+    case SEC_OID_ANSIX962_EC_C2PNB208W1:
+	return 208;
+
     case SEC_OID_SECG_EC_SECP224K1:
     case SEC_OID_SECG_EC_SECP224R1:
-	    return 224;
+	return 224;
+
+    case SEC_OID_SECG_EC_SECT233K1:
+    case SEC_OID_SECG_EC_SECT233R1:
+	return 233;
+
+    case SEC_OID_SECG_EC_SECT239K1:
+    case SEC_OID_ANSIX962_EC_C2TNB239V1:
+    case SEC_OID_ANSIX962_EC_C2TNB239V2:
+    case SEC_OID_ANSIX962_EC_C2TNB239V3:
+    case SEC_OID_ANSIX962_EC_C2ONB239V4:
+    case SEC_OID_ANSIX962_EC_C2ONB239V5:
+    case SEC_OID_ANSIX962_EC_PRIME239V1:
+    case SEC_OID_ANSIX962_EC_PRIME239V2:
+    case SEC_OID_ANSIX962_EC_PRIME239V3:
+	return 239;
+
     case SEC_OID_SECG_EC_SECP256K1:
-	    return 256;
+    case SEC_OID_ANSIX962_EC_PRIME256V1:
+	return 256;
+
+    case SEC_OID_ANSIX962_EC_C2PNB272W1:
+	return 272;
+
+    case SEC_OID_SECG_EC_SECT283K1:
+    case SEC_OID_SECG_EC_SECT283R1:
+	return 283;
+
+    case SEC_OID_ANSIX962_EC_C2PNB304W1:
+	return 304;
+
+    case SEC_OID_ANSIX962_EC_C2TNB359V1:
+	return 359;
+
+    case SEC_OID_ANSIX962_EC_C2PNB368W1:
+	return 368;
+
     case SEC_OID_SECG_EC_SECP384R1:
-	    return 384;
+	return 384;
+
+    case SEC_OID_SECG_EC_SECT409K1:
+    case SEC_OID_SECG_EC_SECT409R1:
+	return 409;
+
+    case SEC_OID_ANSIX962_EC_C2TNB431R1:
+	return 431;
+
     case SEC_OID_SECG_EC_SECP521R1:
-	    return 521;
+	return 521;
+
+    case SEC_OID_SECG_EC_SECT571K1:
+    case SEC_OID_SECG_EC_SECT571R1:
+	return 571;
+
     default:
 	    return 0;
     }