This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new d2c7a4cf732 CAMEL-20231: make generators configurable (#1042)
d2c7a4cf732 is described below
commit d2c7a4cf732a86cb4f582a2722f9ec8efaf901f9
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Dec 13 15:20:11 2023 +0100
CAMEL-20231: make generators configurable (#1042)
---
.../springboot/JasyptEncryptedPropertiesConfiguration.java | 11 ++++++++---
.../src/test/resources/application.properties | 2 ++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesConfiguration.java
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesConfiguration.java
index 7312bcfd731..f73d8a444c9 100644
---
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesConfiguration.java
+++
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesConfiguration.java
@@ -56,11 +56,17 @@ public class JasyptEncryptedPropertiesConfiguration {
@Value("${camel.component.jasypt.salt-generator-class-name}")
private String saltGeneratorClassName =
"org.jasypt.salt.RandomSaltGenerator";
+ /**
+ * The algorithm for the random iv generator
+ */
@Value("${camel.component.jasypt.random-iv-generator-algorithm}")
- private String randomIvGeneratorAlgorithm;
+ private String randomIvGeneratorAlgorithm = "SHA1PRNG";
+ /**
+ * The algorithm for the salt generator
+ */
@Value("${camel.component.jasypt.random-salt-generator-algorithm}")
- private String randomSaltGeneratorAlgorithm;
+ private String randomSaltGeneratorAlgorithm = "SHA1PRNG";
/**
* The class name of the security provider to be used for obtaining the
encryption
@@ -69,7 +75,6 @@ public class JasyptEncryptedPropertiesConfiguration {
@Value("${camel.component.jasypt.provider-name}")
private String providerName;
-
public boolean isEnabled() {
return enabled;
}
diff --git
a/components-starter/camel-jasypt-starter/src/test/resources/application.properties
b/components-starter/camel-jasypt-starter/src/test/resources/application.properties
index 54b2e8a1488..bc777df61db 100644
---
a/components-starter/camel-jasypt-starter/src/test/resources/application.properties
+++
b/components-starter/camel-jasypt-starter/src/test/resources/application.properties
@@ -29,4 +29,6 @@ camel.component.jasypt.algorithm= PBEWITHHMACSHA256ANDAES_256
camel.component.jasypt.password = sys:JASYPT_ENCRYPTION_PASSWORD
camel.component.jasypt.iv-generator-class-name =
org.jasypt.iv.RandomIvGenerator
camel.component.jasypt.salt-generator-class-name =
org.jasypt.salt.RandomSaltGenerator
+camel.component.jasypt.random-iv-generator-algorithm = SHA1PRNG
+camel.component.jasypt.random-salt-generator-algorithm = SHA1PRNG
camel.component.jasypt.provider-name = SunJCE
