Repository: wicket Updated Branches: refs/heads/5756-improve-crypt d47373b92 -> 42ce1faa5
WICKET-5756 Allow to use custom ciphers when using SunJceCrypt class Add a link to SO with the recommendation Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/42ce1faa Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/42ce1faa Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/42ce1faa Branch: refs/heads/5756-improve-crypt Commit: 42ce1faa57d3617ccaa443045537306fabf4d71a Parents: d47373b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Nov 17 13:53:21 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Nov 17 13:53:21 2014 +0200 ---------------------------------------------------------------------- .../util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/42ce1faa/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java index af1b8ce..19515e0 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java @@ -61,6 +61,9 @@ public class UnlimitedStrengthJurisdictionPolicyTest extends Assert assertThat(new String(decrypted2), is(equalTo(input2))); } + /** + * Based on http://stackoverflow.com/a/992413 + */ private static class UnlimitedStrenghtJurisdictionPolicyCrypt extends AbstractCrypt { private final Cipher crypter; @@ -73,12 +76,13 @@ public class UnlimitedStrengthJurisdictionPolicyTest extends Assert SecretKey tmp = factory.generateSecret(spec); SecretKey secret = new SecretKeySpec(tmp.getEncoded(), "AES"); - crypter = Cipher.getInstance("AES/CBC/PKCS5Padding"); + String transformation = "AES/CBC/PKCS5Padding"; + crypter = Cipher.getInstance(transformation); crypter.init(Cipher.ENCRYPT_MODE, secret); AlgorithmParameters params = crypter.getParameters(); byte[] iv = params.getParameterSpec(IvParameterSpec.class).getIV(); - decrypter = Cipher.getInstance("AES/CBC/PKCS5Padding"); + decrypter = Cipher.getInstance(transformation); decrypter.init(Cipher.DECRYPT_MODE, secret, new IvParameterSpec(iv)); }
