/hg/icedtea6: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Oct 24 01:51:48 UTC 2014
changeset 5094b84a8a5c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5094b84a8a5c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 30 14:57:43 2014 +0100
Bump to next version, b33.
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b33.
changeset f2308ef26cf8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2308ef26cf8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 30 16:17:30 2014 +0100
Drop upstreamed patch.
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/8010213-set_socketoptions_windows.patch:
Remove upstreamed patch.
* Makefile.am:
(ICEDTEA_PATCHES): Drop upstreamed patch.
changeset c380668f35d0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c380668f35d0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 08 17:18:58 2014 +0100
Merge
changeset a17dc173fdc5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a17dc173fdc5
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Oct 23 22:35:31 2014 +0100
Sync with upstream OpenJDK 6.
2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch,
* patches/openjdk/7183251-netbeans_renders_text_wrong.patch,
* patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Drop above patches.
* patches/openjdk/6816311-compiler_name.patch:
Drop windows.h fragments applied upstream as OPENJDK6-41.
* patches/openjdk/7122142-annotation_race_condition.patch,
* patches/openjdk/p11cipher-6812738-native_cleanup.patch:
Regenerated following upstream security patches.
changeset 3ffc944aeaac in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ffc944aeaac
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Oct 24 00:48:25 2014 +0100
Merge with icedtea6.
2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/7122142-annotation_race_condition.patch:
Revert to original version, as type synchronisation changes
were not the cause of the HotSpot crashes.
changeset cd81722f010d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cd81722f010d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Oct 24 02:51:29 2014 +0100
Bump to b33 tarball.
2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to security update release date,
14th of October.
(OPENJDK_SHA256SUM): Update for b33 tarball.
diffstat:
ChangeLog | 135 +
Makefile.am | 27 +-
NEWS | 64 +-
patches/ecj/jaxws-getdtdtype.patch | 68 +-
patches/openjdk/4963723-implement_sha-224.patch | 2334 +++++++
patches/openjdk/6578658-sunmscapi_nonewithrsa.patch | 602 +
patches/openjdk/6753664-sunmscapi_sha-256.patch | 640 +
patches/openjdk/6816311-compiler_name.patch | 48 +-
patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch | 33 -
patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch | 117 +
patches/openjdk/7044060-support_nsa_suite_b.patch | 3223 ++++++++++
patches/openjdk/7106773-512_bits_rsa.patch | 1336 ++++
patches/openjdk/7122142-annotation_race_condition.patch | 1955 ++++++
patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch | 40 +
patches/openjdk/7180907-jarsigner_sha-256.patch | 142 +
patches/openjdk/7183251-netbeans_renders_text_wrong.patch | 24 -
patches/openjdk/8000897-use_corresponding_digest_length.patch | 29 +
patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 41 +
patches/openjdk/8010213-set_socketoptions_windows.patch | 29 -
patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch | 69 +
patches/openjdk/8049480-jarsigner_openjdk_9.patch | 295 +
patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch | 347 -
patches/openjdk/p11cipher-6812738-native_cleanup.patch | 38 +-
patches/pr1904-icedtea_and_distro_versioning.patch | 65 +
24 files changed, 11158 insertions(+), 543 deletions(-)
diffs (truncated from 11988 to 500 lines):
diff -r faaea522af93 -r cd81722f010d ChangeLog
--- a/ChangeLog Wed Jul 30 14:41:18 2014 +0100
+++ b/ChangeLog Fri Oct 24 02:51:29 2014 +0100
@@ -1,3 +1,138 @@
+2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Bump to security update release date,
+ 14th of October.
+ (OPENJDK_SHA256SUM): Update for b33 tarball.
+
+2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/7122142-annotation_race_condition.patch:
+ Revert to original version, as type synchronisation changes
+ were not the cause of the HotSpot crashes.
+
+2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch,
+ * patches/openjdk/7183251-netbeans_renders_text_wrong.patch,
+ * patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop above patches.
+ * patches/openjdk/6816311-compiler_name.patch:
+ Drop windows.h fragments applied upstream as OPENJDK6-41.
+ * patches/openjdk/7122142-annotation_race_condition.patch,
+ * patches/openjdk/p11cipher-6812738-native_cleanup.patch:
+ Regenerated following upstream security patches.
+
+2014-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated. Add RH bugzilla ID to
+ 7122142 also.
+ * patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch:
+ Fix for HotSpot bug hit by 7122142.
+ * patches/openjdk/8000897-use_corresponding_digest_length.patch:
+ Fix for SHA-2 bug discovered in RH1155012.
+
+2014-10-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2033: patches/ecj/jaxws-getdtdtype.patch no
+ longer applies since removal of JAXWS drop
+ * NEWS: Updated.
+ * patches/ecj/jaxws-getdtdtype.patch:
+ Regenerated as a normal patch against the
+ OpenJDK source tree.
+
+2014-10-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add 1.13.5 release notes.
+
+2014-10-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Re-enable annotation race
+ condition patch.
+ * patches/openjdk/7122142-annotation_race_condition.patch:
+ Replace with more minimal backport that doesn't
+ alter existing types.
+
+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:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/4963723-implement_sha-224.patch,
+ * patches/openjdk/6578658-sunmscapi_nonewithrsa.patch,
+ * patches/openjdk/6753664-sunmscapi_sha-256.patch,
+ * patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch,
+ * patches/openjdk/7044060-support_nsa_suite_b.patch,
+ * patches/openjdk/7106773-512_bits_rsa.patch,
+ * patches/openjdk/7180907-jarsigner_sha-256.patch,
+ * patches/openjdk/8006935-long_keys_in_hmac_prf.patch,
+ * patches/openjdk/8049480-jarsigner_openjdk_9.patch:
+ Backports to improve cryptography support.
+
+2014-10-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Disable annotation race
+ condition backport temporarily as causes
+ crashes during bootstrap.
+
+2014-10-02 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/7122142-annotation_race_condition.patch:
+ Backport fix for annotation race condition.
+
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1886: IcedTea does not checksum supplied tarballs
+ * Makefile.am:
+ (download-openjdk): Check all tarballs,
+ rather than just those downloaded by $(WGET).
+
+2014-07-14 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_SHA256SUM): Update checksum for new tarball.
+
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8010213-set_socketoptions_windows.patch:
+ Remove upstreamed patch.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop upstreamed patch.
+
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b33.
+
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/jtreg-T6638712-fix.patch,
diff -r faaea522af93 -r cd81722f010d Makefile.am
--- a/Makefile.am Wed Jul 30 14:41:18 2014 +0100
+++ b/Makefile.am Fri Oct 24 02:51:29 2014 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 15_jul_2014
-OPENJDK_SHA256SUM = 1a7404f38b3fa7cbb25d4273c0d94885912badd3343c5184c3b0947437501256
-OPENJDK_VERSION = b32
+OPENJDK_DATE = 14_oct_2014
+OPENJDK_SHA256SUM = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293
+OPENJDK_VERSION = b33
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -496,7 +496,6 @@
patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
patches/openjdk/8009217-fix_test_compile.patch \
patches/openjdk/8009610-blacklist_malware_certificate.patch \
- patches/openjdk/8010213-set_socketoptions_windows.patch \
patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
patches/openjdk/8011154-awt_regression.patch \
patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \
@@ -611,13 +610,24 @@
patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch \
patches/openjdk/8013057-detect_mmap_commit_failures.patch \
patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch \
- patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch \
- patches/openjdk/7183251-netbeans_renders_text_wrong.patch \
patches/openjdk/6904962-getvisualbounds_affected_by_white_space.patch \
patches/openjdk/6611637-npe_in_glyphlayout.patch \
patches/openjdk/6727719-performance_of_textlayout_getbounds.patch \
patches/openjdk/6745225-memory_leak_in_attributed_string.patch \
- patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch
+ patches/openjdk/4963723-implement_sha-224.patch \
+ patches/openjdk/7180907-jarsigner_sha-256.patch \
+ patches/openjdk/8049480-jarsigner_openjdk_9.patch \
+ patches/openjdk/6753664-sunmscapi_sha-256.patch \
+ patches/openjdk/6578658-sunmscapi_nonewithrsa.patch \
+ 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/pr1904-icedtea_and_distro_versioning.patch \
+ patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \
+ patches/openjdk/7122142-annotation_race_condition.patch \
+ patches/openjdk/7161796-wrong_fetch_in_fetch_static_field.patch \
+ patches/openjdk/8000897-use_corresponding_digest_length.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1121,7 +1131,7 @@
else
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
-else
+endif
if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -1140,7 +1150,6 @@
fi
endif
endif
-endif
mkdir -p stamps
touch $@
diff -r faaea522af93 -r cd81722f010d NEWS
--- a/NEWS Wed Jul 30 14:41:18 2014 +0100
+++ b/NEWS Fri Oct 24 02:51:29 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
@@ -19,10 +19,72 @@
- S6727719: Performance of TextLayout.getBounds()
- S6745225: Memory leak while drawing Attributed String
- S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
+ - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations
- S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+ - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror
+ - S8000897, RH1155012: VM crash in CompileBroker
- S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
- S8026887: Make issues due to failed large pages allocations easier to debug
+* Bug fixes
+ - PR1886: IcedTea does not checksum supplied tarballs
+ - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
+
+New in release 1.13.5 (2014-10-14):
+
+* Security fixes
+ - S8015256: Better class accessibility
+ - S8022783, CVE-2014-6504: Optimize C2 optimizations
+ - S8035162: Service printing service
+ - S8035781: Improve equality for annotations
+ - S8036805: Correct linker method lookup.
+ - S8036810: Correct linker field lookup
+ - S8037066, CVE-2014-6457: Secure transport layer
+ - S8037846, CVE-2014-6558: Ensure streaming of input cipher streams
+ - S8038899: Safer safepoints
+ - S8038903: More native monitor monitoring
+ - S8038908: Make Signature more robust
+ - S8038913: Bolster XML support
+ - S8039509, CVE-2014-6512: Wrap sockets more thoroughly
+ - S8039533, CVE-2014-6517: Higher resolution resolvers
+ - S8041540, CVE-2014-6511: Better use of pages in font processing
+ - S8041545: Better validation of generated rasters
+ - S8041564, CVE-2014-6506: Improved management of logger resources
+ - S8041717, CVE-2014-6519: Issue with class file parser
+ - S8042609, CVE-2014-6513: Limit splashiness of splash images
+ - S8042797, CVE-2014-6502: Avoid strawberries in LogRecord
+ - S8044274, CVE-2014-6531: Proper property processing
+* Import of OpenJDK6 b33
+ - OJ37: OpenJDK6-b32 cannot be built on Windows
- OJ39: Handle fonts with the non-canonical processing flag set
+ - OJ41: OpenJDK6 should be compatible with Windows SDK 7.1
+ - OJ42: Remove @Override annotation on interfaces added by 2014/10/14 security fixes.
+ - S6967684: httpserver using a non thread-safe SimpleDateFormat
+ - S7033534: Two tests fail just against jdk7 b136
+ - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called
+ - S7172149: ArrayIndexOutOfBoundsException from Signature.verify
+ - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
+ - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode
+ - S8028192: Use of PKCS11-NSS provider in FIPS mode broken
+ - S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride
+ - S8039396: NPE when writing a class descriptor object to a custom ObjectOutputStream
+ - S8042603: 'SafepointPollOffset' was not declared in static member function 'static bool Arguments::check_vm_args_consistency()'
+ - S8042850: Extra unused entries in ICU ScriptCodes enum
+ - S8052162: REGRESSION: sun/java2d/cmm/ColorConvertOp tests fail since 7u71 b01
+ - S8053963: (dc) Use DatagramChannel.receive() instead of read() in connect()
+* Backports
+ - S4963723: Implement SHA-224
+ - S6578658: Request for raw RSA (NONEwithRSA) Signature support in SunMSCAPI
+ - S6753664: Support SHA256 (and higher) in SunMSCAPI
+ - S7033170: Cipher.getMaxAllowedKeyLength(String) throws NoSuchAlgorithmException
+ - S7044060: Need to support NSA Suite B Cryptography algorithms
+ - S7106773: 512 bits RSA key cannot work with SHA384 and SHA512
+ - 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
+ - S8017173, PR1688: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated
+ - S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
+* Bug fixes
+ - 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 faaea522af93 -r cd81722f010d patches/ecj/jaxws-getdtdtype.patch
--- a/patches/ecj/jaxws-getdtdtype.patch Wed Jul 30 14:41:18 2014 +0100
+++ b/patches/ecj/jaxws-getdtdtype.patch Fri Oct 24 02:51:29 2014 +0100
@@ -1,43 +1,29 @@
-diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties
---- openjdk-ecj.orig/jaxws/build.properties 2011-06-29 23:08:21.756066418 +0100
-+++ openjdk-ecj/jaxws/build.properties 2011-06-29 23:09:51.701491292 +0100
-@@ -81,7 +81,7 @@
- patches.dir=patches
+diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
+--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2014-10-15 22:55:39.955155652 +0100
++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2014-10-15 22:56:29.899840571 +0100
+@@ -276,7 +276,7 @@
+ qName = localName;
+ else
+ qName = prefix + ':' + localName;
+- String type = staxAttr.getDTDType();
++ String type = staxAttr.getDTDType().toString();
+ String value = staxAttr.getValue();
- # Patches to apply
--jaxws_src.patch.list=xjc.patch
-+jaxws_src.patch.list=xjc.patch getdtdtype.patch
+ attrs.addAttribute(uri, localName, qName, type, value);
+diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
+--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2014-10-15 22:55:18.002854659 +0100
++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2014-10-15 22:56:29.899840571 +0100
+@@ -108,11 +108,10 @@
+ * the String "CDATA"
+ * @return the type as a String, default is "CDATA"
+ */
+- public String getDTDType() {
+- return _attributeType;
++ public QName getDTDType() {
++ return new QName(_attributeType);
+ }
- # Sanity information
- sanity.info= Sanity Settings:${line.separator}\
-diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch
---- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2011-06-29 23:09:34.609220483 +0100
-@@ -0,0 +1,27 @@
-+--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000
-++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000
-+@@ -276,7 +276,7 @@
-+ qName = localName;
-+ else
-+ qName = prefix + ':' + localName;
-+- String type = staxAttr.getDTDType();
-++ String type = staxAttr.getDTDType().toString();
-+ String value = staxAttr.getValue();
-+
-+ attrs.addAttribute(uri, localName, qName, type, value);
-+--- src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000
-++++ src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000
-+@@ -108,11 +108,10 @@
-+ * the String "CDATA"
-+ * @return the type as a String, default is "CDATA"
-+ */
-+- public String getDTDType() {
-+- return _attributeType;
-++ public QName getDTDType() {
-++ return new QName(_attributeType);
-+ }
-+
-+-
-+ /**
-+ * A flag indicating whether this attribute was actually
-+ * specified in the start-tag of its element, or was defaulted from the schema.
+-
+ /**
+ * A flag indicating whether this attribute was actually
+ * specified in the start-tag of its element, or was defaulted from the schema.
diff -r faaea522af93 -r cd81722f010d patches/openjdk/4963723-implement_sha-224.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/4963723-implement_sha-224.patch Fri Oct 24 02:51:29 2014 +0100
@@ -0,0 +1,2334 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java openjdk/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java 2014-07-14 04:24:43.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java 2014-10-08 23:26:07.127607311 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2012, 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
+@@ -38,16 +38,16 @@
+ * This class constitutes the core of HMAC-<MD> algorithms, where
+ * <MD> can be SHA1 or MD5, etc.
+ *
+- * It also contains the implementation classes for the SHA-256,
++ * It also contains the implementation classes for SHA-224, SHA-256,
+ * SHA-384, and SHA-512 HMACs.
+ *
+ * @author Jan Luehe
+ */
+-final class HmacCore implements Cloneable {
++abstract class HmacCore extends MacSpi implements Cloneable {
+
+- private final MessageDigest md;
+- private final byte[] k_ipad; // inner padding - key XORd with ipad
+- private final byte[] k_opad; // outer padding - key XORd with opad
++ private MessageDigest md;
++ private byte[] k_ipad; // inner padding - key XORd with ipad
++ private byte[] k_opad; // outer padding - key XORd with opad
+ private boolean first; // Is this the first data to be processed?
+
+ private final int blockLen;
+@@ -73,22 +73,11 @@
+ }
+
+ /**
+- * Constructor used for cloning.
+- */
+- private HmacCore(HmacCore other) throws CloneNotSupportedException {
+- this.md = (MessageDigest)other.md.clone();
+- this.blockLen = other.blockLen;
+- this.k_ipad = (byte[])other.k_ipad.clone();
+- this.k_opad = (byte[])other.k_opad.clone();
+- this.first = other.first;
+- }
+-
+- /**
+ * Returns the length of the HMAC in bytes.
+ *
+ * @return the HMAC length in bytes.
+ */
+- int getDigestLength() {
++ protected int engineGetMacLength() {
+ return this.md.getDigestLength();
+ }
+
+@@ -103,9 +92,8 @@
+ * @exception InvalidAlgorithmParameterException if the given algorithm
+ * parameters are inappropriate for this MAC.
+ */
+- void init(Key key, AlgorithmParameterSpec params)
++ protected void engineInit(Key key, AlgorithmParameterSpec params)
+ throws InvalidKeyException, InvalidAlgorithmParameterException {
+-
+ if (params != null) {
+ throw new InvalidAlgorithmParameterException
+ ("HMAC does not use parameters");
+@@ -140,7 +128,7 @@
+ Arrays.fill(secret, (byte)0);
+ secret = null;
+
+- reset();
++ engineReset();
+ }
+
+ /**
+@@ -148,7 +136,7 @@
+ *
+ * @param input the input byte to be processed.
+ */
+- void update(byte input) {
++ protected void engineUpdate(byte input) {
+ if (first == true) {
+ // compute digest for 1st pass; start with inner pad
+ md.update(k_ipad);
+@@ -167,7 +155,7 @@
+ * @param offset the offset in <code>input</code> where the input starts.
+ * @param len the number of bytes to process.
+ */
+- void update(byte input[], int offset, int len) {
++ protected void engineUpdate(byte input[], int offset, int len) {
+ if (first == true) {
+ // compute digest for 1st pass; start with inner pad
+ md.update(k_ipad);
+@@ -178,7 +166,13 @@
+ md.update(input, offset, len);
+ }
+
+- void update(ByteBuffer input) {
++ /**
++ * Processes the <code>input.remaining()</code> bytes in the ByteBuffer
++ * <code>input</code>.
++ *
++ * @param input the input byte buffer.
++ */
++ protected void engineUpdate(ByteBuffer input) {
+ if (first == true) {
+ // compute digest for 1st pass; start with inner pad
+ md.update(k_ipad);
+@@ -194,7 +188,7 @@
+ *
+ * @return the HMAC result.
+ */
+- byte[] doFinal() {
++ protected byte[] engineDoFinal() {
+ if (first == true) {
+ // compute digest for 1st pass; start with inner pad
+ md.update(k_ipad);
+@@ -223,7 +217,7 @@
+ * Resets the HMAC for further use, maintaining the secret key that the
+ * HMAC was initialized with.
+ */
+- void reset() {
++ protected void engineReset() {
+ if (first == false) {
+ md.reset();
+ first = true;
+@@ -234,118 +228,38 @@
More information about the distro-pkg-dev
mailing list