Mercurial > hg > icedtea11

view patches/rh1022017.patch @ 2678:9d8be6bbedf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS 2019-01-08 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS * patches/disable-intree-ec.patch: Removed. * patches/nss-config.patch: Removed. * patches/nss-not-enabled-config.patch: Removed. * patches/nss-not-enabled-config-with-sunec.patch: Renamed to patches/pkcs11-nss-not-enabled-config.patch. * patches/nss-config-with-sunec.patch: Renamed to patches/pkcs11-nss-config.patch. * INSTALL: Remove --enable-sunec option. Update documentation to match current situation with SunEC. * Makefile.am: (ICEDTEA_PATCHES): Remove disable-intree-ec.patch. Remove PKCS11 config patches without the SunEC provider. Rename remaining two to make it clear they are for the PKCS11 provider. (ICEDTEA_CONFIGURE): Remove use of system-nss option which no longer exists, following PR3681. (ICEDTEA_ENV): Remove NSS_LIBS and NSS_CFLAGS. (check-ecc): Argument passed to the test should now be "yes". * NEWS: Updated. * acinclude.m4: (IT_ENABLE_SUNEC): Removed. * configure.ac: Replace IT_ENABLE_SUNEC call with IT_LOCATE_NSS. * fsg.sh.in: Remove unused source code and use new PR3681 patch instead of old PR2126 patch which only alters Java code. * patches/pr3681.patch: Renamed from patches/pr2126.patch, updated to OpenJDK 9 paths and extended to patch native code. * patches/rh1022017.patch: Updated to OpenJDK 9 paths. * remove-intree-libraries.sh.in: Drop conditional removal of SunEC code. 2018-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch, * patches/rh1022017.patch: Fix file paths due to 8156502 dropping 'Supported' from the front of 'SupportedEllipticCurvesExtension.java' 2017-12-11 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Update to apply against 8u152, following 8157035. 2017-01-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Extend following changes made in 8148516. 2016-11-07 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Remove Brainpool curves added by 8146490. 2016-04-23 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS * Makefile.am: (ECC_RESULT): Removed.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 11 Jan 2019 03:32:22 +0000
parents 04327567ef0a
children
line wrap: on
line source

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