You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/05/28 19:20:50 UTC
[sling-org-apache-sling-commons-crypto] branch master updated
(9f503b5 -> 920d376)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git.
from 9f503b5 suppress warnings for rule java:S100
new 7d40de4 link Jasypt
new 920d376 use JasyptRandomSaltGeneratorRegistrar in JasyptStandardPBEStringCryptoServiceIT
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
.../it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
[sling-org-apache-sling-commons-crypto] 01/02: link Jasypt
Posted by ol...@apache.org.
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 7d40de4b1eef00fc514323f748b474c715c7952d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri May 28 21:08:26 2021 +0200
link Jasypt
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ce62a82..7f263cd 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,6 @@
This module is part of the [Apache Sling](https://sling.apache.org) project.
-This module contains a simple crypto API and an extensible but optional implementation based on Jasypt as well as an plugin for Felix Web Console to encrypt messages.
+This module contains a simple crypto API and an extensible but optional implementation based on [Jasypt](https://github.com/jasypt/jasypt) as well as a plugin for Felix Web Console to encrypt messages.
See [Sling's documentation for Commons Crypto](https://sling.apache.org/documentation/bundles/commons-crypto.html) for details.
[sling-org-apache-sling-commons-crypto] 02/02: use
JasyptRandomSaltGeneratorRegistrar in
JasyptStandardPBEStringCryptoServiceIT
Posted by ol...@apache.org.
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 <ol...@apache.org>
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)