295329
diff -r cdfd161703ed src/share/classes/sun/security/ssl/HelloExtensions.java
295329
--- openjdk/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	Wed Oct 23 05:22:55 2013 +0100
295329
+++ openjdk/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	Thu Nov 07 12:41:45 2013 +0000
295329
@@ -435,25 +435,11 @@
295329
     // the extension value to send in the ClientHello message
295329
     static final SupportedEllipticCurvesExtension DEFAULT;
295329
 
295329
-    private static final boolean fips;
295329
-
295329
     static {
295329
-        int[] ids;
295329
-        fips = SunJSSE.isFIPS();
295329
-        if (fips == false) {
295329
-            ids = new int[] {
295329
-                // NIST curves first
295329
-                // prefer NIST P-256, rest in order of increasing key length
295329
-                23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
295329
-                // non-NIST curves
295329
-                15, 16, 17, 2, 18, 4, 5, 20, 8, 22,
295329
-            };
295329
-        } else {
295329
-            ids = new int[] {
295329
-                // same as above, but allow only NIST curves in FIPS mode
295329
-                23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
295329
-            };
295329
-        }
295329
+	int[] ids = new int[] {
295329
+	    // NSS currently only supports these three NIST curves
295329
+	    23, 24, 25
295329
+	};
295329
         DEFAULT = new SupportedEllipticCurvesExtension(ids);
295329
     }
295329
 
295329
@@ -545,10 +531,6 @@
295329
         if ((index <= 0) || (index >= NAMED_CURVE_OID_TABLE.length)) {
295329
             return false;
295329
         }
295329
-        if (fips == false) {
295329
-            // in non-FIPS mode, we support all valid indices
295329
-            return true;
295329
-        }
295329
         return DEFAULT.contains(index);
295329
     }
295329