(sling-org-apache-sling-commons-crypto) branch master updated: SLING-13340 Do no longer preferably use the first Provider exposed via OSGi service (#7)

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git


The following commit(s) were added to refs/heads/master by this push:
     new d2eba75  SLING-13340 Do no longer preferably use the first Provider 
exposed via OSGi service (#7)
d2eba75 is described below

commit d2eba75b1fc8177de9a5eeba9cd1e2cde2670d04
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Sun Sep 13 11:53:56 2026 +0200

    SLING-13340 Do no longer preferably use the first Provider exposed via OSGi 
service (#7)
    
    registry
    
    For still leveraging non JRE providers use the newly introduced
    OSGiAwareSecurityProvider together with configuration
    "securityProviderName".
---
 .../JasyptStandardPbeStringCryptoService.java       | 10 ----------
 .../JasyptStandardPbeStringCryptoServiceTest.java   | 21 ---------------------
 2 files changed, 31 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoService.java
 
b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoService.java
index 08eff49..3cac9fd 100644
--- 
a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoService.java
+++ 
b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoService.java
@@ -18,7 +18,6 @@
  */
 package org.apache.sling.commons.crypto.jasypt.internal;
 
-import java.security.Provider;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Set;
@@ -66,11 +65,6 @@ public final class JasyptStandardPbeStringCryptoService 
implements CryptoService
     @Reference
     private volatile IvGenerator ivGenerator;
 
-    @Reference(
-        cardinality = ReferenceCardinality.OPTIONAL
-    )
-    private volatile Provider securityProvider;
-
     @Reference(
         cardinality = ReferenceCardinality.OPTIONAL
     )
@@ -124,10 +118,6 @@ public final class JasyptStandardPbeStringCryptoService 
implements CryptoService
         if (Objects.nonNull(securityProviderName) && 
!securityProviderName.isBlank()) {
             encryptor.setProviderName(securityProviderName);
         }
-        final Provider provider = this.securityProvider;
-        if (Objects.nonNull(provider)) {
-            encryptor.setProvider(provider);
-        }
         final SaltGenerator saltGenerator = this.saltGenerator;
         if (Objects.nonNull(saltGenerator)) {
             encryptor.setSaltGenerator(saltGenerator);
diff --git 
a/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceTest.java
 
b/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceTest.java
index 676d01d..c6d64ae 100644
--- 
a/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceTest.java
+++ 
b/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceTest.java
@@ -98,25 +98,4 @@ public class JasyptStandardPbeStringCryptoServiceTest {
         assertThat(message, is(MESSAGE));
     }
 
-    @Test
-    public void testProvider() throws Exception {
-        final Provider securityProvider = new BouncyCastleProvider();
-        final PasswordProvider passwordProvider = mock(PasswordProvider.class);
-        
when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray());
-        final JasyptStandardPbeStringCryptoService service = new 
JasyptStandardPbeStringCryptoService();
-        FieldUtils.writeDeclaredField(service, "passwordProvider", 
passwordProvider, true);
-        FieldUtils.writeDeclaredField(service, "ivGenerator", new 
RandomIvGenerator(), true);
-        FieldUtils.writeDeclaredField(service, "securityProvider", 
securityProvider, true);
-
-        final JasyptStandardPbeStringCryptoServiceConfiguration configuration 
= mock(JasyptStandardPbeStringCryptoServiceConfiguration.class);
-        
when(configuration.algorithm()).thenReturn("PBEWITHSHA256AND128BITAES-CBC-BC");
-        
when(configuration.keyObtentionIterations()).thenReturn(DEFAULT_KEY_OBTENTION_ITERATIONS);
-        when(configuration.securityProviderName()).thenReturn(null);
-        
when(configuration.stringOutputType()).thenReturn(STRING_OUTPUT_TYPE_BASE64);
-        MethodUtils.invokeMethod(service, true, "activate", configuration);
-        final String ciphertext = service.encrypt(MESSAGE);
-        final String message = service.decrypt(ciphertext);
-        assertThat(message, is(MESSAGE));
-    }
-
 }