Reviewer needed: backport of "6883983: JarVerifier dependency on sun.security.pkcs should be removed" into IcedTea6 HEAD

[Jiri Vanek]

On 02/24/2012 02:56 PM, Pavel Tisnovsky wrote:
> Hi,
>
> I'd like to push following backport "6883983: JarVerifier dependency on sun.security.pkcs should be removed"
> into IcedTea6 HEAD. This backport is first part of fixes for issue mentioned here
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=882
>
> hg diff containing patch + Makefile.am change + NEWS change are stored in an attachment.
>

It loks ok. I was afraid that you just missed an exception, but because it is "unmodificable" backport and ParsingException is really Extending IOexception it is ok.

J.

> ChangeLog entry:
>
> 2012-02-24  Pavel Tisnovsky<ptisnovs at redhat.com>
>
>          * Makefile.am: Add new patch.
>          * NEWS: Mention backport.
>          * patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch:
>          Backport of S6883983: JarVerifier dependency on
>          sun.security.pkcs should be removed
>
> Could anybody review this change please?
>
> Cheers,
> Pavel
>
>
> hg.diff
>
>
> diff -r 6b69d846d8cb Makefile.am
> --- a/Makefile.am	Fri Feb 24 13:52:49 2012 +0100
> +++ b/Makefile.am	Fri Feb 24 14:53:08 2012 +0100
> @@ -421,7 +421,8 @@
>   	patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
>   	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
>   	patches/openjdk/remove-mimpure-option-to-gcc.patch \
> -	patches/ScriptEngineManager-doc.patch
> +	patches/ScriptEngineManager-doc.patch \
> +	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch
>
>   if WITH_RHINO
>   ICEDTEA_PATCHES += \
> diff -r 6b69d846d8cb NEWS
> --- a/NEWS	Fri Feb 24 13:52:49 2012 +0100
> +++ b/NEWS	Fri Feb 24 14:53:08 2012 +0100
> @@ -18,6 +18,7 @@
>     - S6706974: Add krb5 test infrastructure
>     - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
>     - S6761072: new krb5 tests fail on multiple platforms
> +  - S6883983: JarVerifier dependency on sun.security.pkcs should be removed
>
>   New in release 1.10.6 (2012-02-14):
>
> diff -r 6b69d846d8cb patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch	Fri Feb 24 14:53:08 2012 +0100
> @@ -0,0 +1,23 @@
> +# HG changeset patch
> +# User alanb
> +# Date 1255604044 -3600
> +# Node ID f6833a276c1d74a51bcf6ac99f21aab317c7535b
> +# Parent  16b33372af1c8555012d4b8dde6e12226f0d866a
> +6883983: JarVerifier dependency on sun.security.pkcs should be removed
> +Reviewed-by: sherman, wetmore
> +
> +diff -r 16b33372af1c -r f6833a276c1d src/share/classes/java/util/jar/JarVerifier.java
> +--- openjdk.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java	Wed Oct 14 20:16:02 2009 -0700
> ++++ openjdk/jdk/src/share/classes/java/util/jar/JarVerifier.java	Thu Oct 15 11:54:04 2009 +0100
> +@@ -293,10 +293,8 @@
> +                 }
> +                 sfv.process(sigFileSigners);
> +
> +-            } catch (sun.security.pkcs.ParsingException pe) {
> +-                if (debug != null) debug.println("processEntry caught: "+pe);
> +-                // ignore and treat as unsigned
> +             } catch (IOException ioe) {
> ++                // e.g. sun.security.pkcs.ParsingException
> +                 if (debug != null) debug.println("processEntry caught: "+ioe);
> +                 // ignore and treat as unsigned
> +             } catch (SignatureException se) {
>