[2.2 BRANCH] Allow providers to pass TestAES even if they don't provide wrap mode

[Dr Andrew John Hughes]

If a cryptography provider doesn't support a particular mode or algorithm,
it throws exception.  At present, the tests added in u4 skip testing that
function of such providers, with the exception of wrapping in TestAES,
which instead throws the exception up to the user and causes the test to
fail.  This treats a request for wrap mode like the others, and skips the
test if it's not available.

Ok for 2.2 branch?
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
# HG changeset patch
# User andrew
# Date 1336091783 -3600
# Node ID 5f96377cf55e0233ef502e77c29e5510ea8c5a4e
# Parent  9b7558b91244fd890631aa8c150a9bc1d55dc37b
Skip wrap mode tests if wrap mode is not available.

diff --git a/test/com/oracle/security/ucrypto/TestAES.java b/test/com/oracle/security/ucrypto/TestAES.java
--- a/test/com/oracle/security/ucrypto/TestAES.java
+++ b/test/com/oracle/security/ucrypto/TestAES.java
@@ -219,7 +219,12 @@
                     System.err.println("Skipping Unsupported CIP algo: " + algos[i]);
                     continue;
                 }
-                c1.init(Cipher.WRAP_MODE, key, (AlgorithmParameters)null, null);
+		try {
+		    c1.init(Cipher.WRAP_MODE, key, (AlgorithmParameters)null, null);
+		} catch (InvalidAlgorithmParameterException e) {
+		    System.err.println("Skipping due to lack of WRAP_MODE support.");
+		    continue;
+		}
                 AlgorithmParameters params = c1.getParameters();
                 Cipher c2 = Cipher.getInstance(algos[i], interopP);
                 c2.init(Cipher.UNWRAP_MODE, key, params, null);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120516/a208e056/attachment.bin