This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git
commit 920d37612c2d062009a7b061f7184ed4320d363d Author: Oliver Lietz <[email protected]> AuthorDate: Fri May 28 21:20:38 2021 +0200 use JasyptRandomSaltGeneratorRegistrar in JasyptStandardPBEStringCryptoServiceIT --- .../it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java index 52b1c59..1f7bda5 100644 --- a/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java +++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java @@ -31,7 +31,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; import org.ops4j.pax.exam.util.PathUtils; import static com.google.common.truth.Truth.assertThat; -import static org.jasypt.iv.RandomIvGenerator.DEFAULT_SECURE_RANDOM_ALGORITHM; import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration; @@ -51,7 +50,10 @@ public class JasyptStandardPBEStringCryptoServiceIT extends JasyptCryptoTestSupp .put("algorithm", "PBEWITHHMACSHA512ANDAES_256") .asOption(), factoryConfiguration("org.apache.sling.commons.crypto.jasypt.internal.JasyptRandomIvGeneratorRegistrar") - .put("algorithm", DEFAULT_SECURE_RANDOM_ALGORITHM) + .put("algorithm", "SHA1PRNG") + .asOption(), + factoryConfiguration("org.apache.sling.commons.crypto.jasypt.internal.JasyptRandomSaltGeneratorRegistrar") + .put("algorithm", "SHA1PRNG") .asOption(), factoryConfiguration("org.apache.sling.commons.crypto.internal.FilePasswordProvider") .put("path", path)
