/hg/icedtea6-hg: Remove upstreamed JDK security patches from 201...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 2 05:53:51 PDT 2013
changeset 2074ba4e8816 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2074ba4e8816
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 02 13:52:22 2013 +0100
Remove upstreamed JDK security patches from 2013/06/18 erratum.
2013-08-02 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/6469266-xmlsec_1.4.2.patch,
* patches/openjdk/6888167-medialib_memory_leaks.patch,
* patches/openjdk/7195301-no_instanceof_node.patch,
* patches/security/20130618/6741606-apache_santuario.patch,
* patches/security/20130618/7170730-windows_network_stack.patch,
* patches/security/20130618/8000638-improve_deserialization.patch,
* patches/security/20130618/8001032-restrict_object_access-jdk.patch,
* patches/security/20130618/8001033-refactor_address_handling.patch,
* patches/security/20130618/8001034-memory_management.patch,
* patches/security/20130618/8001038-resourcefully_handle_resources.patch,
* patches/security/20130618/8001043-clarify_definition_restrictions.patch,
* patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch,
* patches/security/20130618/8001318-6_fixup.patch,
* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
* patches/security/20130618/8001330-improve_checking_order.patch,
* patches/security/20130618/8003703-update_rmi_connection_dialog.patch,
* patches/security/20130618/8004584-augment_applet_contextualization.patch,
* patches/security/20130618/8005007-better_glyph_processing.patch,
* patches/security/20130618/8006328-6_fixup.patch,
* patches/security/20130618/8006328-sound_class_robustness.patch,
* patches/security/20130618/8006611-improve_scripting.patch,
* patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch,
* patches/security/20130618/8007471-6_fixup.patch,
* patches/security/20130618/8007471-improve_mbean_notifications.patch,
* patches/security/20130618/8007812-getenclosingmethod.patch,
* patches/security/20130618/8008120-improve_jmx_class_checking.patch,
* patches/security/20130618/8008124-better_compliance_testing.patch,
* patches/security/20130618/8008128-better_jmx_api_coherence.patch,
* patches/security/20130618/8008132-better_serialization.patch,
* patches/security/20130618/8008585-jmx_data_handling.patch,
* patches/security/20130618/8008593-better_urlclassloader.patch,
* patches/security/20130618/8008603-jmx_provider_provision.patch,
* patches/security/20130618/8008611-6_fixup.patch,
* patches/security/20130618/8008611-jmx_annotations.patch,
* patches/security/20130618/8008615-jmx_internal_api_robustness.patch,
* patches/security/20130618/8008623-mbeanserver_handling.patch,
* patches/security/20130618/8008744-6741606_rework.patch,
* patches/security/20130618/8008982-jmx_interface_changes.patch,
* patches/security/20130618/8009004-rmi_connection_improvement.patch,
* patches/security/20130618/8009013-t2k_glyphs.patch,
* patches/security/20130618/8009034-jmx_notification_improvement.patch,
* patches/security/20130618/8009038-jmx_notification_support_improvement.patch,
* patches/security/20130618/8009067-improve_key_storing.patch,
* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
* patches/security/20130618/8011243-improve_imaginglib.patch,
* patches/security/20130618/8011248-better_component_rasters.patch,
* patches/security/20130618/8011253-better_short_component_rasters.patch,
* patches/security/20130618/8011257-better_byte_component_rasters.patch,
* patches/security/20130618/8011557-improve_reflection.patch,
* patches/security/20130618/8012421-better_positioning.patch,
* patches/security/20130618/8012438-better_image_validation.patch,
* patches/security/20130618/8012597-better_image_channel_validation.patch,
* patches/security/20130618/8012601-better_layout_validation.patch,
* patches/security/20130618/8014281-better_xml_signature_checking.patch,
* patches/security/20130618/diamond_fix.patch,
* patches/security/20130618/javac_issue.patch,
* Makefile.am:
Remove unused patches.
* Makefile.am:
(SECURITY_PATCHES): Remove upstreamed security
patches.
diffstat:
ChangeLog | 64 +
Makefile.am | 56 -
patches/openjdk/6469266-xmlsec_1.4.2.patch | 23876 ----------
patches/openjdk/6888167-medialib_memory_leaks.patch | 134 -
patches/openjdk/7195301-no_instanceof_node.patch | 86 -
patches/security/20130618/6741606-apache_santuario.patch | 8110 ---
patches/security/20130618/7170730-windows_network_stack.patch | 1057 -
patches/security/20130618/8000638-improve_deserialization.patch | 26 -
patches/security/20130618/8001032-restrict_object_access-jdk.patch | 21 -
patches/security/20130618/8001033-refactor_address_handling.patch | 119 -
patches/security/20130618/8001034-memory_management.patch | 78 -
patches/security/20130618/8001038-resourcefully_handle_resources.patch | 236 -
patches/security/20130618/8001043-clarify_definition_restrictions.patch | 92 -
patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch | 36 -
patches/security/20130618/8001318-6_fixup.patch | 114 -
patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch | 470 -
patches/security/20130618/8001330-improve_checking_order.patch | 97 -
patches/security/20130618/8003703-update_rmi_connection_dialog.patch | 131 -
patches/security/20130618/8004584-augment_applet_contextualization.patch | 322 -
patches/security/20130618/8005007-better_glyph_processing.patch | 118 -
patches/security/20130618/8006328-6_fixup.patch | 31 -
patches/security/20130618/8006328-sound_class_robustness.patch | 6937 --
patches/security/20130618/8006611-improve_scripting.patch | 78 -
patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch | 108 -
patches/security/20130618/8007471-6_fixup.patch | 25 -
patches/security/20130618/8007471-improve_mbean_notifications.patch | 89 -
patches/security/20130618/8007812-getenclosingmethod.patch | 89 -
patches/security/20130618/8008120-improve_jmx_class_checking.patch | 332 -
patches/security/20130618/8008124-better_compliance_testing.patch | 20 -
patches/security/20130618/8008128-better_jmx_api_coherence.patch | 110 -
patches/security/20130618/8008132-better_serialization.patch | 121 -
patches/security/20130618/8008585-jmx_data_handling.patch | 69 -
patches/security/20130618/8008593-better_urlclassloader.patch | 270 -
patches/security/20130618/8008603-jmx_provider_provision.patch | 29 -
patches/security/20130618/8008611-6_fixup.patch | 20 -
patches/security/20130618/8008611-jmx_annotations.patch | 32 -
patches/security/20130618/8008615-jmx_internal_api_robustness.patch | 70 -
patches/security/20130618/8008623-mbeanserver_handling.patch | 121 -
patches/security/20130618/8008744-6741606_rework.patch | 882 -
patches/security/20130618/8008982-jmx_interface_changes.patch | 168 -
patches/security/20130618/8009004-rmi_connection_improvement.patch | 54 -
patches/security/20130618/8009013-t2k_glyphs.patch | 39 -
patches/security/20130618/8009034-jmx_notification_improvement.patch | 30 -
patches/security/20130618/8009038-jmx_notification_support_improvement.patch | 89 -
patches/security/20130618/8009067-improve_key_storing.patch | 20 -
patches/security/20130618/8009235-improve_tsa_data_handling.patch | 80 -
patches/security/20130618/8011243-improve_imaginglib.patch | 618 -
patches/security/20130618/8011248-better_component_rasters.patch | 51 -
patches/security/20130618/8011253-better_short_component_rasters.patch | 140 -
patches/security/20130618/8011257-better_byte_component_rasters.patch | 157 -
patches/security/20130618/8011557-improve_reflection.patch | 132 -
patches/security/20130618/8012421-better_positioning.patch | 100 -
patches/security/20130618/8012438-better_image_validation.patch | 283 -
patches/security/20130618/8012597-better_image_channel_validation.patch | 597 -
patches/security/20130618/8012601-better_layout_validation.patch | 125 -
patches/security/20130618/8014281-better_xml_signature_checking.patch | 49 -
patches/security/20130618/diamond_fix.patch | 55 -
patches/security/20130618/javac_issue.patch | 60 -
58 files changed, 64 insertions(+), 47459 deletions(-)
diffs (truncated from 47766 to 500 lines):
diff -r 73409100db47 -r 2074ba4e8816 ChangeLog
--- a/ChangeLog Wed Jul 31 18:04:46 2013 +0100
+++ b/ChangeLog Fri Aug 02 13:52:22 2013 +0100
@@ -1,3 +1,67 @@
+2013-08-02 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/6469266-xmlsec_1.4.2.patch,
+ * patches/openjdk/6888167-medialib_memory_leaks.patch,
+ * patches/openjdk/7195301-no_instanceof_node.patch,
+ * patches/security/20130618/6741606-apache_santuario.patch,
+ * patches/security/20130618/7170730-windows_network_stack.patch,
+ * patches/security/20130618/8000638-improve_deserialization.patch,
+ * patches/security/20130618/8001032-restrict_object_access-jdk.patch,
+ * patches/security/20130618/8001033-refactor_address_handling.patch,
+ * patches/security/20130618/8001034-memory_management.patch,
+ * patches/security/20130618/8001038-resourcefully_handle_resources.patch,
+ * patches/security/20130618/8001043-clarify_definition_restrictions.patch,
+ * patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch,
+ * patches/security/20130618/8001318-6_fixup.patch,
+ * patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
+ * patches/security/20130618/8001330-improve_checking_order.patch,
+ * patches/security/20130618/8003703-update_rmi_connection_dialog.patch,
+ * patches/security/20130618/8004584-augment_applet_contextualization.patch,
+ * patches/security/20130618/8005007-better_glyph_processing.patch,
+ * patches/security/20130618/8006328-6_fixup.patch,
+ * patches/security/20130618/8006328-sound_class_robustness.patch,
+ * patches/security/20130618/8006611-improve_scripting.patch,
+ * patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch,
+ * patches/security/20130618/8007471-6_fixup.patch,
+ * patches/security/20130618/8007471-improve_mbean_notifications.patch,
+ * patches/security/20130618/8007812-getenclosingmethod.patch,
+ * patches/security/20130618/8008120-improve_jmx_class_checking.patch,
+ * patches/security/20130618/8008124-better_compliance_testing.patch,
+ * patches/security/20130618/8008128-better_jmx_api_coherence.patch,
+ * patches/security/20130618/8008132-better_serialization.patch,
+ * patches/security/20130618/8008585-jmx_data_handling.patch,
+ * patches/security/20130618/8008593-better_urlclassloader.patch,
+ * patches/security/20130618/8008603-jmx_provider_provision.patch,
+ * patches/security/20130618/8008611-6_fixup.patch,
+ * patches/security/20130618/8008611-jmx_annotations.patch,
+ * patches/security/20130618/8008615-jmx_internal_api_robustness.patch,
+ * patches/security/20130618/8008623-mbeanserver_handling.patch,
+ * patches/security/20130618/8008744-6741606_rework.patch,
+ * patches/security/20130618/8008982-jmx_interface_changes.patch,
+ * patches/security/20130618/8009004-rmi_connection_improvement.patch,
+ * patches/security/20130618/8009013-t2k_glyphs.patch,
+ * patches/security/20130618/8009034-jmx_notification_improvement.patch,
+ * patches/security/20130618/8009038-jmx_notification_support_improvement.patch,
+ * patches/security/20130618/8009067-improve_key_storing.patch,
+ * patches/security/20130618/8009235-improve_tsa_data_handling.patch,
+ * patches/security/20130618/8011243-improve_imaginglib.patch,
+ * patches/security/20130618/8011248-better_component_rasters.patch,
+ * patches/security/20130618/8011253-better_short_component_rasters.patch,
+ * patches/security/20130618/8011257-better_byte_component_rasters.patch,
+ * patches/security/20130618/8011557-improve_reflection.patch,
+ * patches/security/20130618/8012421-better_positioning.patch,
+ * patches/security/20130618/8012438-better_image_validation.patch,
+ * patches/security/20130618/8012597-better_image_channel_validation.patch,
+ * patches/security/20130618/8012601-better_layout_validation.patch,
+ * patches/security/20130618/8014281-better_xml_signature_checking.patch,
+ * patches/security/20130618/diamond_fix.patch,
+ * patches/security/20130618/javac_issue.patch,
+ * Makefile.am:
+ Remove unused patches.
+ * Makefile.am:
+ (SECURITY_PATCHES): Remove upstreamed security
+ patches.
+
2013-07-31 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/ecj/jcp-importsources.patch,
diff -r 73409100db47 -r 2074ba4e8816 Makefile.am
--- a/Makefile.am Wed Jul 31 18:04:46 2013 +0100
+++ b/Makefile.am Fri Aug 02 13:52:22 2013 +0100
@@ -282,64 +282,8 @@
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- patches/openjdk/7195301-no_instanceof_node.patch \
- patches/openjdk/6469266-xmlsec_1.4.2.patch \
- patches/security/20130618/6741606-apache_santuario.patch \
- patches/security/20130618/7170730-windows_network_stack.patch \
- patches/security/20130618/8000638-improve_deserialization.patch \
patches/security/20130618/8001032-restrict_object_access-corba.patch \
- patches/security/20130618/8001032-restrict_object_access-jdk.patch \
- patches/security/20130618/8001033-refactor_address_handling.patch \
- patches/security/20130618/8001034-memory_management.patch \
- patches/security/20130618/8001038-resourcefully_handle_resources.patch \
- patches/security/20130618/8001043-clarify_definition_restrictions.patch \
- patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch \
- patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch \
- patches/security/20130618/8001318-6_fixup.patch \
- patches/security/20130618/8001330-improve_checking_order.patch \
- patches/security/20130618/8003703-update_rmi_connection_dialog.patch \
- patches/security/20130618/8004584-augment_applet_contextualization.patch \
- patches/security/20130618/8005007-better_glyph_processing.patch \
- patches/security/20130618/8006328-sound_class_robustness.patch \
- patches/security/20130618/8006328-6_fixup.patch \
- patches/security/20130618/8006611-improve_scripting.patch \
- patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch \
- patches/security/20130618/8007471-improve_mbean_notifications.patch \
- patches/security/20130618/8007471-6_fixup.patch \
- patches/security/20130618/8007812-getenclosingmethod.patch \
- patches/security/20130618/8008120-improve_jmx_class_checking.patch \
- patches/security/20130618/8008124-better_compliance_testing.patch \
- patches/security/20130618/8008128-better_jmx_api_coherence.patch \
- patches/security/20130618/8008132-better_serialization.patch \
- patches/security/20130618/8008585-jmx_data_handling.patch \
- patches/security/20130618/8008593-better_urlclassloader.patch \
- patches/security/20130618/8008603-jmx_provider_provision.patch \
- patches/security/20130618/8008611-jmx_annotations.patch \
- patches/security/20130618/8008611-6_fixup.patch \
- patches/security/20130618/8008615-jmx_internal_api_robustness.patch \
- patches/security/20130618/8008623-mbeanserver_handling.patch \
- patches/security/20130618/8008744-6741606_rework.patch \
- patches/security/20130618/8008982-jmx_interface_changes.patch \
- patches/security/20130618/8009004-rmi_connection_improvement.patch \
- patches/security/20130618/8009013-t2k_glyphs.patch \
- patches/security/20130618/8009034-jmx_notification_improvement.patch \
- patches/security/20130618/8009038-jmx_notification_support_improvement.patch \
- patches/security/20130618/8009067-improve_key_storing.patch \
- patches/security/20130618/8009235-improve_tsa_data_handling.patch \
- patches/openjdk/6888167-medialib_memory_leaks.patch \
- patches/security/20130618/8011243-improve_imaginglib.patch \
- patches/security/20130618/8011248-better_component_rasters.patch \
- patches/security/20130618/8011253-better_short_component_rasters.patch \
- patches/security/20130618/8011257-better_byte_component_rasters.patch \
- patches/security/20130618/8011557-improve_reflection.patch \
- patches/security/20130618/8012421-better_positioning.patch \
- patches/security/20130618/8012438-better_image_validation.patch \
- patches/security/20130618/8012597-better_image_channel_validation.patch \
- patches/security/20130618/8012601-better_layout_validation.patch \
- patches/security/20130618/8014281-better_xml_signature_checking.patch \
- patches/security/20130618/diamond_fix.patch \
patches/security/20130618/handle_npe.patch \
- patches/security/20130618/javac_issue.patch \
patches/security/20130618/8000642-better_transportation_handling.patch \
patches/openjdk/6786028-wcag_bold_tags.patch \
patches/openjdk/6786682-wcag_lang.patch \
diff -r 73409100db47 -r 2074ba4e8816 patches/openjdk/6469266-xmlsec_1.4.2.patch
--- a/patches/openjdk/6469266-xmlsec_1.4.2.patch Wed Jul 31 18:04:46 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23876 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1371136223 -3600
-# Node ID a955a845f0d1b8e21e0780986d971b3712db26c7
-# Parent 2ae6d8da293f30c94c9478a6634c7a480328c5c5
-6469266: Integrate Apache XMLSec 1.4.2 into JDK 7
-Reviewed-by: valeriep
-
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java b/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
-@@ -20,12 +20,9 @@
- */
- package com.sun.org.apache.xml.internal.security;
-
--
--
- import java.io.InputStream;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
--
- import javax.xml.parsers.DocumentBuilder;
- import javax.xml.parsers.DocumentBuilderFactory;
-
-@@ -51,7 +48,7 @@
- * done by calling {@link Init#init} which should be done in any static block
- * of the files of this library. We ensure that this call is only executed once.
- *
-- * @author $Author: raul $
-+ * @author $Author: mullan $
- */
- public final class Init {
-
-@@ -113,20 +110,19 @@
- dbf.setValidating(false);
-
- DocumentBuilder db = dbf.newDocumentBuilder();
--
- // We don't allow users to override the Apache XML Security
- // configuration in the JRE. Users should use the standard security
- // provider mechanism instead if implementing their own
- // transform or canonicalization algorithms.
-- // String cfile = System.getProperty("com.sun.org.apache.xml.internal.security.resource.config");
-- // InputStream is =
-- // Class.forName("com.sun.org.apache.xml.internal.security.Init")
-- // .getResourceAsStream(cfile != null ? cfile : "resource/config.xml");
-+ // InputStream is = Class.forName("com.sun.org.apache.xml.internal.security.Init").getResourceAsStream("resource/config.xml");
- InputStream is = (InputStream) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
-+// String cfile = System.getProperty
-+// ("com.sun.org.apache.xml.internal.security.resource.config");
- return getClass().getResourceAsStream
-- ("resource/config.xml");
-+// (cfile != null ? cfile : "resource/config.xml");
-+ ("resource/config.xml");
- }
- });
-
-@@ -167,7 +163,7 @@
- //
- // if (tag.equals("ResourceBundles")){
- // XX_configure_i18n_start = System.currentTimeMillis();
--// Element resource=(Element)el;
-+// Element resource=(Element)el;
- // /* configure internationalization */
- // Attr langAttr = resource.getAttributeNode("defaultLanguageCode");
- // Attr countryAttr = resource.getAttributeNode("defaultCountryCode");
-@@ -202,11 +198,11 @@
-
- if (currMeth.getDeclaringClass().getName()
- .equals(JAVACLASS)) {
-- log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString());
-+ log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
- }
- }*/
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", "
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", "
- + JAVACLASS + ")");
- Canonicalizer.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
-@@ -233,9 +229,8 @@
- "JAVACLASS");
- try {
- Class.forName(JAVACLASS);
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS
-- + ")");
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS + ")");
- Transform.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
- Object exArgs[] = { URI, JAVACLASS };
-@@ -284,12 +279,11 @@
- //
- // if (currMeth.getDeclaringClass().getName()
- // .equals(JAVACLASS)) {
--// log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString());
-+// log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
- // }
- // }
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", "
-- + JAVACLASS + ")");
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", " + JAVACLASS + ")");
- SignatureAlgorithm.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
- Object exArgs[] = { URI, JAVACLASS };
-@@ -320,13 +314,11 @@
- "DESCRIPTION");
-
- if ((Description != null) && (Description.length() > 0)) {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": "
-- + Description);
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
- } else {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS
-- + ": For unknown purposes");
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
- }
- try {
- ResourceResolver.register(JAVACLASS);
-@@ -359,13 +351,11 @@
- "DESCRIPTION");
-
- if ((Description != null) && (Description.length() > 0)) {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": "
-- + Description);
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
- } else {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS
-- + ": For unknown purposes");
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
- }
-
- KeyResolver.register(JAVACLASS);
-@@ -376,8 +366,8 @@
-
- if (tag.equals("PrefixMappings")){
- XX_configure_reg_prefixes_start = System.currentTimeMillis();
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
-
- Element[] nl = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"PrefixMapping");
-
-@@ -386,8 +376,8 @@
- "namespace");
- String prefix = nl[i].getAttributeNS(null,
- "prefix");
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
- com.sun.org.apache.xml.internal.security.utils.ElementProxy
- .setDefaultPrefix(namespace, prefix);
- }
-@@ -398,19 +388,19 @@
- long XX_init_end = System.currentTimeMillis();
-
- //J-
-- if (true) {
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
-+ if (log.isLoggable(java.util.logging.Level.FINE)) {
-+ log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
-+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
- }
- } catch (Exception e) {
- log.log(java.util.logging.Level.SEVERE, "Bad: ", e);
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java b/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
-@@ -24,7 +24,7 @@
-
- import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
- import com.sun.org.apache.xml.internal.security.utils.Constants;
--import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
-+import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
-
-@@ -33,11 +33,7 @@
- * The Algorithm class which stores the Algorithm URI as a string.
- *
- */
--public abstract class Algorithm extends ElementProxy {
--
-- /** {@link java.util.logging} logging facility */
-- static java.util.logging.Logger log =
-- java.util.logging.Logger.getLogger(Algorithm.class.getName());
-+public abstract class Algorithm extends SignatureElementProxy {
-
- /**
- *
-@@ -79,7 +75,7 @@
- */
- protected void setAlgorithmURI(String algorithmURI) {
-
-- if ((this._state == MODE_CREATE) && (algorithmURI != null)) {
-+ if ( (algorithmURI != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
- algorithmURI);
- }
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java b/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
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
-@@ -35,7 +35,7 @@
- /**
- * This class maps algorithm identifier URIs to JAVA JCE class names.
- *
-- * @author $Author: raul $
-+ * @author $Author: mullan $
- */
- public class JCEMapper {
-
-@@ -45,9 +45,9 @@
-
-
-
-- private static Map uriToJCEName = new HashMap();
-+ private static Map uriToJCEName;
-
-- private static Map algorithmsMap = new HashMap();
-+ private static Map algorithmsMap;
-
- private static String providerName = null;
- /**
-@@ -63,6 +63,8 @@
-
- static void loadAlgorithms( Element algorithmsEl) {
- Element[] algorithms = XMLUtils.selectNodes(algorithmsEl.getFirstChild(),Init.CONF_NS,"Algorithm");
-+ uriToJCEName = new HashMap( algorithms.length * 2);
-+ algorithmsMap = new HashMap( algorithms.length * 2);
- for (int i = 0 ;i < algorithms.length ;i ++) {
- Element el = algorithms[i];
- String id = el.getAttribute("URI");
-@@ -70,6 +72,7 @@
- uriToJCEName.put(id, jceName);
- algorithmsMap.put(id, new Algorithm(el));
- }
-+
- }
-
- static Algorithm getAlgorithmMapping(String algoURI) {
-@@ -84,8 +87,8 @@
- *
- */
- public static String translateURItoJCEID(String AlgorithmURI) {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-
- String jceName = (String) uriToJCEName.get(AlgorithmURI);
- return jceName;
-@@ -100,8 +103,8 @@
- *
- */
- public static String getAlgorithmClassFromURI(String AlgorithmURI) {
-- if (true)
-- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-+ if (log.isLoggable(java.util.logging.Level.FINE))
-+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-
- return ((Algorithm) algorithmsMap.get(AlgorithmURI)).algorithmClass;
- }
-diff --git a/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java b/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
-@@ -20,10 +20,10 @@
- */
- package com.sun.org.apache.xml.internal.security.algorithms;
-
--
--
- import java.security.MessageDigest;
- import java.security.NoSuchProviderException;
-+import java.util.HashMap;
-+import java.util.Map;
-
- import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
- import com.sun.org.apache.xml.internal.security.utils.Constants;
-@@ -41,11 +41,6 @@
- */
- public class MessageDigestAlgorithm extends Algorithm {
-
-- /** {@link java.util.logging} logging facility */
-- static java.util.logging.Logger log =
-- java.util.logging.Logger.getLogger(
-- MessageDigestAlgorithm.class.getName());
--
- /** Message Digest - NOT RECOMMENDED MD5*/
- public static final String ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5 = Constants.MoreAlgorithmsSpecNS + "md5";
- /** Digest - Required SHA1*/
-@@ -76,6 +71,12 @@
- this.algorithm = messageDigest;
- }
-
-+ static ThreadLocal instances=new ThreadLocal() {
-+ protected Object initialValue() {
-+ return new HashMap();
-+ };
-+ };
-+
- /**
- * Factory method for constructing a message digest algorithm by name.
- *
-@@ -86,8 +87,15 @@
- */
- public static MessageDigestAlgorithm getInstance(
- Document doc, String algorithmURI) throws XMLSignatureException {
-+ MessageDigest md = getDigestInstance(algorithmURI);
-+ return new MessageDigestAlgorithm(doc, md, algorithmURI);
-+ }
-
-- String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI);
-+private static MessageDigest getDigestInstance(String algorithmURI) throws XMLSignatureException {
-+ MessageDigest result=(MessageDigest) ((Map)instances.get()).get(algorithmURI);
-+ if (result!=null)
-+ return result;
-+ String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI);
-
- if (algorithmID == null) {
- Object[] exArgs = { algorithmURI };
More information about the distro-pkg-dev
mailing list