Blame SOURCES/rh1022017-reduce_ssl_curves.patch

c47d95
diff --git openjdk.orig///src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java openjdk///src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
c47d95
--- openjdk.orig///src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
c47d95
+++ openjdk///src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
c47d95
@@ -515,50 +515,19 @@
c47d95
                 }
c47d95
             } else {        // default groups
c47d95
                 NamedGroup[] groups;
c47d95
-                if (requireFips) {
c47d95
-                    groups = new NamedGroup[] {
c47d95
-                        // only NIST curves in FIPS mode
c47d95
-                        NamedGroup.SECP256_R1,
c47d95
-                        NamedGroup.SECP384_R1,
c47d95
-                        NamedGroup.SECP521_R1,
c47d95
-                        NamedGroup.SECT283_K1,
c47d95
-                        NamedGroup.SECT283_R1,
c47d95
-                        NamedGroup.SECT409_K1,
c47d95
-                        NamedGroup.SECT409_R1,
c47d95
-                        NamedGroup.SECT571_K1,
c47d95
-                        NamedGroup.SECT571_R1,
c47d95
+	    groups = new NamedGroup[] {
c47d95
+		// only NIST curves in FIPS mode
c47d95
+		NamedGroup.SECP256_R1,
c47d95
+		NamedGroup.SECP384_R1,
c47d95
+		NamedGroup.SECP521_R1,
c47d95
 
c47d95
-                        // FFDHE 2048
c47d95
-                        NamedGroup.FFDHE_2048,
c47d95
-                        NamedGroup.FFDHE_3072,
c47d95
-                        NamedGroup.FFDHE_4096,
c47d95
-                        NamedGroup.FFDHE_6144,
c47d95
-                        NamedGroup.FFDHE_8192,
c47d95
-                    };
c47d95
-                } else {
c47d95
-                    groups = new NamedGroup[] {
c47d95
-                        // NIST curves first
c47d95
-                        NamedGroup.SECP256_R1,
c47d95
-                        NamedGroup.SECP384_R1,
c47d95
-                        NamedGroup.SECP521_R1,
c47d95
-                        NamedGroup.SECT283_K1,
c47d95
-                        NamedGroup.SECT283_R1,
c47d95
-                        NamedGroup.SECT409_K1,
c47d95
-                        NamedGroup.SECT409_R1,
c47d95
-                        NamedGroup.SECT571_K1,
c47d95
-                        NamedGroup.SECT571_R1,
c47d95
-
c47d95
-                        // non-NIST curves
c47d95
-                        NamedGroup.SECP256_K1,
c47d95
-
c47d95
-                        // FFDHE 2048
c47d95
-                        NamedGroup.FFDHE_2048,
c47d95
-                        NamedGroup.FFDHE_3072,
c47d95
-                        NamedGroup.FFDHE_4096,
c47d95
-                        NamedGroup.FFDHE_6144,
c47d95
-                        NamedGroup.FFDHE_8192,
c47d95
-                    };
c47d95
-                }
c47d95
+		// FFDHE 2048
c47d95
+		NamedGroup.FFDHE_2048,
c47d95
+		NamedGroup.FFDHE_3072,
c47d95
+		NamedGroup.FFDHE_4096,
c47d95
+		NamedGroup.FFDHE_6144,
c47d95
+		NamedGroup.FFDHE_8192,
c47d95
+	    };
c47d95
 
c47d95
                 groupList = new ArrayList<>(groups.length);
c47d95
                 for (NamedGroup group : groups) {