Mercurial > hg > release > icedtea6-1.13
changeset 3178:766bf00e3bf2
S8000897, RH1155012: VM crash in CompileBroker
2014-10-24 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am,
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/8000897-use_corresponding_digest_length.patch:
Fix for SHA-2 bug discovered in RH1155012.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Fri, 24 Oct 2014 18:45:33 +0100 |
parents | b151eb4fe5bc |
children | 72e1b748868f |
files | ChangeLog Makefile.am NEWS patches/openjdk/8000897-use_corresponding_digest_length.patch |
diffstat | 4 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 24 17:59:53 2014 +0100 +++ b/ChangeLog Fri Oct 24 18:45:33 2014 +0100 @@ -1,3 +1,11 @@ +2014-10-24 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am, + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. + * patches/openjdk/8000897-use_corresponding_digest_length.patch: + Fix for SHA-2 bug discovered in RH1155012. + 2014-10-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Fri Oct 24 17:59:53 2014 +0100 +++ b/Makefile.am Fri Oct 24 18:45:33 2014 +0100 @@ -619,7 +619,8 @@ 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/7161796-wrong_fetch_in_fetch_static_field.patch \ + patches/openjdk/8000897-use_corresponding_digest_length.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Fri Oct 24 17:59:53 2014 +0100 +++ b/NEWS Fri Oct 24 18:45:33 2014 +0100 @@ -17,6 +17,7 @@ * Backports - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror + - S8000897, RH1155012: VM crash in CompileBroker * Bug fixes - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8000897-use_corresponding_digest_length.patch Fri Oct 24 18:45:33 2014 +0100 @@ -0,0 +1,29 @@ +# HG changeset patch +# User valeriep +# Date 1361905960 28800 +# Tue Feb 26 11:12:40 2013 -0800 +# Node ID 5ffba58b541fb00dfd38a5ad5bc3ac7d8156f03f +# Parent 210fb90ee33ad4785f949fdbae4b0e75f73f576c +8000897: VM crash in CompileBroker +Summary: Fixed to use the corresponding digest length when generating output. +Reviewed-by: mullan + +diff -r 210fb90ee33a -r 5ffba58b541f src/share/classes/sun/security/provider/SHA2.java +--- openjdk/jdk/src/share/classes/sun/security/provider/SHA2.java Wed Feb 13 10:40:31 2013 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/provider/SHA2.java Tue Feb 26 11:12:40 2013 -0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 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 +@@ -101,7 +101,7 @@ + i2bBig4((int)bitsProcessed, buffer, 60); + implCompress(buffer, 0); + +- i2bBig(state, 0, out, ofs, 32); ++ i2bBig(state, 0, out, ofs, engineGetDigestLength()); + } + + /**