/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Oct 9 01:13:27 UTC 2014
changeset 81f59ee7bcb5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=81f59ee7bcb5
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Oct 09 01:32:24 2014 +0100
PR1904: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
2014-10-09 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/pr1904-icedtea_and_distro_versioning.patch:
Backport of versioning fix from IcedTea 2.x.
changeset 98216d6a48cf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=98216d6a48cf
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Oct 09 01:39:15 2014 +0100
S8017173, PR1688: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated
2014-10-09 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch:
Backport of regression fix from 7u for PR1688.
changeset 09cb54af2f31 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=09cb54af2f31
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Oct 09 01:42:05 2014 +0100
PR1967: Move to new OpenJDK bug URL format
2014-08-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Update OpenJDK bug URL.
diffstat:
ChangeLog | 20 ++
Makefile.am | 4 +-
NEWS | 5 +-
patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch | 69 ++++++++++
patches/pr1904-icedtea_and_distro_versioning.patch | 65 +++++++++
5 files changed, 161 insertions(+), 2 deletions(-)
diffs (209 lines):
diff -r c125344ef224 -r 09cb54af2f31 ChangeLog
--- a/ChangeLog Thu Oct 09 00:55:41 2014 +0100
+++ b/ChangeLog Thu Oct 09 01:42:05 2014 +0100
@@ -1,3 +1,23 @@
+2014-08-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Update OpenJDK bug URL.
+
+2014-10-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch:
+ Backport of regression fix from 7u for PR1688.
+
+2014-10-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/pr1904-icedtea_and_distro_versioning.patch:
+ Backport of versioning fix from IcedTea 2.x.
+
2014-10-08 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r c125344ef224 -r 09cb54af2f31 Makefile.am
--- a/Makefile.am Thu Oct 09 00:55:41 2014 +0100
+++ b/Makefile.am Thu Oct 09 01:42:05 2014 +0100
@@ -626,7 +626,9 @@
patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch \
patches/openjdk/7044060-support_nsa_suite_b.patch \
patches/openjdk/8006935-long_keys_in_hmac_prf.patch \
- patches/openjdk/7106773-512_bits_rsa.patch
+ patches/openjdk/7106773-512_bits_rsa.patch \
+ patches/pr1904-icedtea_and_distro_versioning.patch \
+ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch
# Temporarily disabled as causes crashes
# patches/openjdk/7122142-annotation_race_condition.patch
diff -r c125344ef224 -r 09cb54af2f31 NEWS
--- a/NEWS Thu Oct 09 00:55:41 2014 +0100
+++ b/NEWS Thu Oct 09 01:42:05 2014 +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
@@ -30,11 +30,14 @@
- S7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
- S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
+ - S8017173, PR1688: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated
- S8026887: Make issues due to failed large pages allocations easier to debug
- S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
- OJ39: Handle fonts with the non-canonical processing flag set
* Bug fixes
- PR1886: IcedTea does not checksum supplied tarballs
+ - PR1904: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
+ - PR1967: Move to new OpenJDK bug URL format
New in release 1.13.4 (2014-07-15):
diff -r c125344ef224 -r 09cb54af2f31 patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch Thu Oct 09 01:42:05 2014 +0100
@@ -0,0 +1,69 @@
+# HG changeset patch
+# User mullan
+# Date 1373562821 14400
+# Thu Jul 11 13:13:41 2013 -0400
+# Node ID c5d869453212ac971258f818de8b158dc22b6e8c
+# Parent 3119569301137347116bc045e4010f477bbc7a72
+8017173: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated
+Reviewed-by: xuelei, vinnie
+
+diff -r 311956930113 -r c5d869453212 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
+--- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Thu Jul 11 12:41:19 2013 +0400
++++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Thu Jul 11 13:13:41 2013 -0400
+@@ -160,7 +160,7 @@
+ );
+ algorithmsMap.put(
+ XMLCipher.RSA_OAEP,
+- new Algorithm("RSA", "RSA/ECB/OAEPPadding", "KeyTransport")
++ new Algorithm("RSA", "RSA/ECB/OAEPWithSHA1AndMGF1Padding", "KeyTransport")
+ );
+ algorithmsMap.put(
+ XMLCipher.DIFFIE_HELLMAN,
+diff -r 311956930113 -r c5d869453212 test/com/sun/org/apache/xml/internal/security/encryption/XMLCipher/GetInstance.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/com/sun/org/apache/xml/internal/security/encryption/XMLCipher/GetInstance.java Thu Jul 11 13:13:41 2013 -0400
+@@ -0,0 +1,44 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/*
++ * @test
++ * @bug 8017173
++ * @summary Check that an XMLCipher with RSA_OAEP Key Transport algorithm can
++ * be instantiated
++ * @compile -XDignore.symbol.file GetInstance.java
++ * @run main GetInstance
++ */
++import com.sun.org.apache.xml.internal.security.Init;
++import com.sun.org.apache.xml.internal.security.encryption.XMLCipher;
++
++public class GetInstance {
++
++ private static final String RSA_OAEP =
++ "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p";
++
++ public static void main(String[] args) throws Exception {
++ Init.init();
++ XMLCipher.getInstance(RSA_OAEP);
++ }
++}
diff -r c125344ef224 -r 09cb54af2f31 patches/pr1904-icedtea_and_distro_versioning.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr1904-icedtea_and_distro_versioning.patch Thu Oct 09 01:42:05 2014 +0100
@@ -0,0 +1,65 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
+--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2014-07-14 04:12:31.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2014-10-09 01:27:44.721520676 +0100
+@@ -197,6 +197,8 @@
+ echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
+ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
+ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
++ echo "DERIVATIVE_ID = $(DERIVATIVE_ID)"; \
++ echo "DISTRIBUTION_ID = $(DISTRIBUTION_ID)"; \
+ echo; \
+ echo "# Used for platform dispatching"; \
+ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2014-10-09 01:26:56.716850976 +0100
++++ openjdk/hotspot/make/linux/makefiles/vm.make 2014-10-09 01:28:07.481838204 +0100
+@@ -109,11 +109,11 @@
+ endif
+
+ ifdef DERIVATIVE_ID
+-CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
++CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
+ endif
+
+ ifdef DISTRIBUTION_ID
+-CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
++CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+ endif
+
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make 2014-10-09 01:26:56.720851031 +0100
++++ openjdk/hotspot/make/solaris/makefiles/vm.make 2014-10-09 01:28:49.158419635 +0100
+@@ -85,6 +85,14 @@
+ ${HS_LIB_ARCH} \
+ ${VM_DISTRO}
+
++ifdef DERIVATIVE_ID
++CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
++endif
++
++ifdef DISTRIBUTION_ID
++CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
++endif
++
+ # This is VERY important! The version define must only be supplied to vm_version.o
+ # If not, ccache will not re-use the cache at all, since the version string might contain
+ # a time and date.
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/vm.make openjdk/hotspot/make/windows/makefiles/vm.make
+--- openjdk.orig/hotspot/make/windows/makefiles/vm.make 2014-07-14 04:12:31.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/vm.make 2014-10-09 01:29:21.930876855 +0100
+@@ -83,6 +83,14 @@
+ # Define that so jni.h is on correct side
+ CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
+
++!ifdef DERIVATIVE_ID
++CXX_FLAGS = $(CPP_FLAGS) /D "DERIVATIVE_ID=\"$(DERIVATIVE_ID)\""
++!endif
++
++!ifdef DISTRIBUTION_ID
++CXX_FLAGS = $(CPP_FLAGS) /D "DISTRIBUTION_ID=\"$(DISTRIBUTION_ID)\""
++!endif
++
+ !if "$(BUILDARCH)" == "ia64"
+ STACK_SIZE="/STACK:1048576,262144"
+ !else
More information about the distro-pkg-dev
mailing list