[jboss-cvs] Picketbox SVN: r451 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/crypto.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2013-09-06 14:50:07 -0400 (Fri, 06 Sep 2013)
New Revision: 451

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
Log:
[BZ#901312] CryptoUtil.hasUnlimitedCrypto() returns true even if the unlimited JCE cryptography is not installed

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java	2013-09-06 18:29:46 UTC (rev 450)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java	2013-09-06 18:50:07 UTC (rev 451)
@@ -476,17 +476,7 @@
       boolean hasUnlimitedCrypto = false;
       try
       { 
-         Class<?> keyGenClass = KeyGenerator.class;
-         Class<?>[] sig = {String.class};
-         Object[] args = {"Blowfish"};
-         Method kgenInstance = keyGenClass.getDeclaredMethod("getInstance", sig);
-         Object kgen = kgenInstance.invoke(null, args);
-
-         Class<?>[] sig2 = {int.class};
-         Object[] args2 = {Integer.valueOf(256)};
-         Method init = keyGenClass.getDeclaredMethod("init", sig2);         
-         init.invoke(kgen, args2);
-         hasUnlimitedCrypto = true;
+         hasUnlimitedCrypto = javax.crypto.Cipher.getMaxAllowedKeyLength("Blowfish") > 128;
       }
       catch(Throwable e)
       {