Author: alexoree
Date: Mon Jul 29 21:27:52 2013
New Revision: 1508205
URL: http://svn.apache.org/r1508205
Log:
JUDDI-602 adding an additional check for 256 bit aes tests for sun based jre's
without the JCE installed
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java?rev=1508205&r1=1508204&r2=1508205&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
Mon Jul 29 21:27:52 2013
@@ -63,12 +63,12 @@ public abstract class AESCryptorAbstract
*/
public AESCryptorAbstract()
throws NoSuchAlgorithmException, InvalidKeySpecException,
NoSuchPaddingException, InvalidKeyException {
- //byte[] raw =//skey.getEncoded();
- // hexToBytes(getKey()); //
- //SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ byte[] raw =//skey.getEncoded();
+ hexToBytes(getKey()); //
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
// Instantiate the cipher
- //Cipher cipher = Cipher.getInstance("AES");
- //cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ Cipher cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
}
/**
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java?rev=1508205&r1=1508204&r2=1508205&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
Mon Jul 29 21:27:52 2013
@@ -459,7 +459,10 @@ public class AuthenticatorTest
{
Assert.fail("config reports that the setting is
not encrypted");
}
- }
+ } catch (InvalidKeyException e)
+ {
+ logger.error("Hey, you're probably using the Oracle JRE
without the Unlimited Strength Java Crypto Extensions installed. AES256 won't
work until you download and install it", e);
+ }
catch (Exception e) {
logger.error(e.getMessage(),e);
Assert.fail("unexpected");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
