1 files changed, 5 insertions, 14 deletions
diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
index edaf8e211e..70aa79ddd0 100644
--- a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
+++ b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
@@ -168,20 +168,11 @@ final class EllipticCurvesExtension extends HelloExtension {
                     "contains no supported elliptic curves");
             }
         } else {        // default curves
-            int[] ids;
-            if (requireFips) {
-                ids = new int[] {
-                    // only NIST curves in FIPS mode
-                    23, 24, 25, 9, 10, 11, 12, 13, 14,
-                };
-            } else {
-                ids = new int[] {
-                    // NIST curves first
-                    23, 24, 25, 9, 10, 11, 12, 13, 14,
-                    // non-NIST curves
-                    22,
-                };
-            }
+            int[] ids = new int[] {
+                // The three widely-used NIST curves:
+                // secp256r1, secp384r1 & secp521r1
+                23, 24, 25
+            };
 
             idList = new ArrayList<>(ids.length);
             for (int curveId : ids) {