/hg/icedtea: 3 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu May 14 03:24:14 UTC 2015


changeset 04327567ef0a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=04327567ef0a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 04:03:46 2015 +0100

	PR1834, RH1022017: Report elliptic curves supported by NSS, not the SunEC library

	2014-06-10  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1834, RH1022017: Report elliptic curves
		supported by NSS, not the SunEC library
		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch so
		that the NSS set of curves are announced
		via SSL.
		* NEWS: Updated.
		* patches/rh1022017.patch:
		Reduce number of curves announced over SSL
		to just those supported by NSS.


changeset d7956e879a00 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d7956e879a00
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 04:19:28 2015 +0100

	PR1829: Support AM_MAINTAINER_MODE

	2014-06-10  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1829: Support AM_MAINTAINER_MODE
		* NEWS: Updated.
		* configure.ac: Invoke the AM_MAINTAINER_MODE
		macro with a default of enabled.


changeset cf37c5aefadd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cf37c5aefadd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 04:24:00 2015 +0100

	PR1968: Move to new OpenJDK bug URL format

	2014-08-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1968: Move to new OpenJDK bug URL format
		* NEWS: Update OpenJDK bug URL.


diffstat:

 ChangeLog               |  25 +++++++++++++++++++++++++
 Makefile.am             |   3 ++-
 NEWS                    |   5 ++++-
 configure.ac            |   1 +
 patches/rh1022017.patch |  44 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 2 deletions(-)

diffs (130 lines):

diff -r 82ddf394f5d9 -r cf37c5aefadd ChangeLog
--- a/ChangeLog	Thu May 14 03:43:26 2015 +0100
+++ b/ChangeLog	Thu May 14 04:24:00 2015 +0100
@@ -1,3 +1,28 @@
+2014-08-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1968: Move to new OpenJDK bug URL format
+	* NEWS: Update OpenJDK bug URL.
+
+2014-06-10  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1829: Support AM_MAINTAINER_MODE
+	* NEWS: Updated.
+	* configure.ac: Invoke the AM_MAINTAINER_MODE
+	macro with a default of enabled.
+
+2014-06-10  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1834, RH1022017: Report elliptic curves
+	supported by NSS, not the SunEC library
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch so
+	that the NSS set of curves are announced
+	via SSL.
+	* NEWS: Updated.
+	* patches/rh1022017.patch:
+	Reduce number of curves announced over SSL
+	to just those supported by NSS.
+
 2015-05-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR2355: CACAO build fails to use JRE layout
diff -r 82ddf394f5d9 -r cf37c5aefadd Makefile.am
--- a/Makefile.am	Thu May 14 03:43:26 2015 +0100
+++ b/Makefile.am	Thu May 14 04:24:00 2015 +0100
@@ -214,7 +214,8 @@
 
 ICEDTEA_PATCHES = \
 	patches/memory-limits.patch \
-	patches/override-redirect-metacity.patch
+	patches/override-redirect-metacity.patch \
+	patches/rh1022017.patch
 
 # Conditional patches
 
diff -r 82ddf394f5d9 -r cf37c5aefadd NEWS
--- a/NEWS	Thu May 14 03:43:26 2015 +0100
+++ b/NEWS	Thu May 14 04:24:00 2015 +0100
@@ -1,6 +1,6 @@
 Key:
 
-SX  - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X
+SX  - https://bugs.openjdk.java.net/browse/JDK-X
 PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X
 RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X
 DX  - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
@@ -46,12 +46,15 @@
   - PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot JDK
   - PR1812: Unable to locate HotSpot checksum when downloading
   - PR1813: HotSpot URL should be used with --enable-hg
+  - PR1829: Support AM_MAINTAINER_MODE
+  - PR1834, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
   - PR1845: jstack.stp in OpenJDK8 is broken
   - PR1935: HotSpot extraction needs to depend on the tarball being downloaded
   - PR1938: Zero broken by enforced use of -Werror
   - PR1942: Bug reports lack IcedTea version & distribution packaging information
   - PR1950: Add build support for Zero SH
   - PR1965, G498288: Allow builds on PaX kernels
+  - PR1968: Move to new OpenJDK bug URL format
   - PR1994: make dist broken
   - PR2199: Support giflib 5.1.0
   - PR2212: DGifCloseFile call should check the return value, not the error code, for failure
diff -r 82ddf394f5d9 -r cf37c5aefadd configure.ac
--- a/configure.ac	Thu May 14 03:43:26 2015 +0100
+++ b/configure.ac	Thu May 14 04:24:00 2015 +0100
@@ -1,5 +1,6 @@
 AC_INIT([icedtea], [3.0.0pre03], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
 
 # Older automake doesn't generate these correctly
diff -r 82ddf394f5d9 -r cf37c5aefadd patches/rh1022017.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/rh1022017.patch	Thu May 14 04:24:00 2015 +0100
@@ -0,0 +1,44 @@
+diff -r a5c3d9643077 src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Feb 10 16:24:28 2015 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Thu May 14 04:01:02 2015 +0100
+@@ -37,25 +37,11 @@
+     // the extension value to send in the ClientHello message
+     static final SupportedEllipticCurvesExtension DEFAULT;
+ 
+-    private static final boolean fips;
+-
+     static {
+-        int[] ids;
+-        fips = SunJSSE.isFIPS();
+-        if (fips == false) {
+-            ids = new int[] {
+-                // NIST curves first
+-                // prefer NIST P-256, rest in order of increasing key length
+-                23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
+-                // non-NIST curves
+-                15, 16, 17, 2, 18, 4, 5, 20, 8, 22,
+-            };
+-        } else {
+-            ids = new int[] {
+-                // same as above, but allow only NIST curves in FIPS mode
+-                23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
+-            };
+-        }
++	int[] ids = new int[] {
++	    // NSS currently only supports these three NIST curves
++	    23, 24, 25
++	};
+         DEFAULT = new SupportedEllipticCurvesExtension(ids);
+     }
+ 
+@@ -150,10 +136,6 @@
+         if ((index <= 0) || (index >= NAMED_CURVE_OID_TABLE.length)) {
+             return false;
+         }
+-        if (fips == false) {
+-            // in non-FIPS mode, we support all valid indices
+-            return true;
+-        }
+         return DEFAULT.contains(index);
+     }
+ 


More information about the distro-pkg-dev mailing list