[jboss-cvs] JBossAS SVN: r114608 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto.

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

Author: ehugonnet
Date: 2013-12-18 11:40:50 -0500 (Wed, 18 Dec 2013)
New Revision: 114608

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
Log:
JBPAPP-10556: CryptoUtil.hasUnlimitedCrypto() returns true even if the unlimited JCE cryptography is not installed
Backport from EAP 6


Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java	2013-12-18 08:20:34 UTC (rev 114607)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/crypto/CryptoUtil.java	2013-12-18 16:40:50 UTC (rev 114608)
@@ -24,7 +24,6 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.security.KeyException;
@@ -35,7 +34,6 @@
 import java.security.Security;
 import java.util.Random;
 
-import javax.crypto.KeyGenerator;
 import javax.crypto.spec.SecretKeySpec;
 
 import org.jboss.crypto.digest.DigestCallback;
@@ -476,17 +474,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)
       {