/hg/icedtea6: Added missing patch.

[ptisnovs at icedtea.classpath.org]

changeset 643fb6254e80 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=643fb6254e80
author: ptisnovs
date: Wed May 09 18:39:35 2012 +0200

	Added missing patch.


diffstat:

 patches/remove_multicatch_in_testrsa.patch |  109 +++++++++++++++++++++++++++++
 1 files changed, 109 insertions(+), 0 deletions(-)

diffs (113 lines):

diff -r ad292421658b -r 643fb6254e80 patches/remove_multicatch_in_testrsa.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/remove_multicatch_in_testrsa.patch	Wed May 09 18:39:35 2012 +0200
@@ -0,0 +1,109 @@
+--- openjdk/jdk/test/com/oracle/security/ucrypto/TestRSA.java
++++ openjdk/jdk/test/com/oracle/security/ucrypto/TestRSA.java
+@@ -189,7 +189,10 @@
+ 		  new BigInteger(CRT_COEFF)));
+ 	    PublicKey pubKey = kf.generatePublic(new RSAPublicKeySpec(mod, pub));
+ 	    return new KeyPair(pubKey, privKey);
+-	} catch (NoSuchAlgorithmException|InvalidKeySpecException ex) {
++	} catch (NoSuchAlgorithmException ex) {
++	    System.err.println("Couldn't generate predefined key pair: " + ex);
++	    return null;
++	} catch (InvalidKeySpecException ex) {
+ 	    System.err.println("Couldn't generate predefined key pair: " + ex);
+ 	    return null;
+ 	}
+@@ -256,7 +259,11 @@
+             String algo = CIP_ALGOS[i];
+             try {
+                 c1 = Cipher.getInstance(algo, prov);
+-            } catch (NoSuchAlgorithmException|NoSuchPaddingException nsae) {
++            } catch (NoSuchAlgorithmException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++		results[i] = true;
++                continue;
++            } catch (NoSuchPaddingException nsae) {
+                 System.err.println("Skip unsupported Cipher algo: " + algo);
+ 		results[i] = true;
+                 continue;
+@@ -268,7 +275,15 @@
+ 		} else {
+ 		    c2 = Cipher.getInstance(algo, prov);
+ 		}
+-            } catch (NoSuchAlgorithmException|NoSuchPaddingException|NoSuchProviderException nsae) {
++            } catch (NoSuchAlgorithmException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++		results[i] = true;
++                continue;
++            } catch (NoSuchPaddingException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++		results[i] = true;
++                continue;
++            } catch (NoSuchProviderException nsae) {
+                 System.err.println("Skip unsupported Cipher algo: " + algo);
+ 		results[i] = true;
+                 continue;
+@@ -299,7 +314,10 @@
+ 	    results[i] = true;
+             try {
+                 c1 = Cipher.getInstance(algo, prov);
+-            } catch (NoSuchAlgorithmException|NoSuchPaddingException nsae) {
++            } catch (NoSuchAlgorithmException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++                continue;
++            } catch (NoSuchPaddingException nsae) {
+                 System.err.println("Skip unsupported Cipher algo: " + algo);
+                 continue;
+             }
+@@ -310,7 +328,13 @@
+ 		} else {
+ 		    c2 = Cipher.getInstance(algo, prov);
+ 		}
+-            } catch (NoSuchAlgorithmException|NoSuchPaddingException|NoSuchProviderException nsae) {
++            } catch (NoSuchAlgorithmException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++                continue;
++            } catch (NoSuchPaddingException nsae) {
++                System.err.println("Skip unsupported Cipher algo: " + algo);
++                continue;
++            } catch (NoSuchProviderException nsae) {
+                 System.err.println("Skip unsupported Cipher algo: " + algo);
+                 continue;
+             }
+@@ -411,7 +435,11 @@
+ 		} else {
+ 		    sig2 = Signature.getInstance(algo, prov);
+ 		}
+-	    } catch (NoSuchAlgorithmException|NoSuchProviderException nsae) {
++	    } catch (NoSuchAlgorithmException nsae) {
++		System.err.println("Skip unsupported interop Signature algo: " + algo);
++		results[i] = true;
++		continue;
++	    } catch (NoSuchProviderException nsae) {
+ 		System.err.println("Skip unsupported interop Signature algo: " + algo);
+ 		results[i] = true;
+ 		continue;
+@@ -445,7 +473,10 @@
+ 		} else {
+ 		    sig2 = Signature.getInstance(algo, prov);
+ 		}
+-            } catch (NoSuchAlgorithmException|NoSuchProviderException nsae) {
++            } catch (NoSuchAlgorithmException nsae) {
++                System.err.println("Skip unsupported Signature algo: " + algo);
++                continue;
++            } catch (NoSuchProviderException nsae) {
+                 System.err.println("Skip unsupported Signature algo: " + algo);
+                 continue;
+             }
+@@ -494,7 +525,11 @@
+ 	    sig2.initSign(kp.getPrivate());
+ 	    sig2.update(data);
+ 	    out2 = sig2.sign();
+-	} catch (InvalidKeyException|SignatureException ex) {
++	} catch (InvalidKeyException ex) {
++	    System.err.println("SIGN ERROR: unexpected exception " + ex);
++	    ex.printStackTrace();
++	    testInit2 = false;
++	} catch (SignatureException ex) {
+ 	    System.err.println("SIGN ERROR: unexpected exception " + ex);
+ 	    ex.printStackTrace();
+ 	    testInit2 = false;