Merge pull request #342 from adorsys/fix-javalangillegal-argumentexce…

…ption-missing-provider fix: java.lang.IllegalArgumentException missing provider
adorsys · Jul 30, 2024 · ea27fc6 · ea27fc6
2 parents 641144b + 8b43b56
commit ea27fc6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -142,6 +142,7 @@
  <ignoredUsedUndeclaredDependencies>
  <ignoredUsedUndeclaredDependency>org.bouncycastle</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>javax.inject:javax.inject</ignoredUsedUndeclaredDependency>
+ <ignoredUsedUndeclaredDependency>de.adorsys.keymanagement:bouncycastle-adapter</ignoredUsedUndeclaredDependency>
  </ignoredUsedUndeclaredDependencies>
  </configuration>
  </execution>

diff --git a/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java b/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
@@ -6,8 +6,8 @@
 import de.adorsys.datasafe.encrypiton.impl.cmsencryption.decryptors.Decryptor;
 import de.adorsys.datasafe.encrypiton.impl.cmsencryption.decryptors.DecryptorFactory;
 import de.adorsys.datasafe.encrypiton.impl.cmsencryption.exceptions.DecryptionException;
-import de.adorsys.datasafe.encrypiton.impl.utils.ProviderUtils;
 import de.adorsys.datasafe.types.api.context.annotations.RuntimeDelegate;
+import de.adorsys.keymanagement.adapter.modules.generator.GeneratorModule_ProviderFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -145,7 +145,7 @@ private OutputStream streamEncrypt(OutputStream dataContentStream, Set<Recipient
 
  return generator.open(
  dataContentStream,
- new JceCMSContentEncryptorBuilder(algorithm).setProvider(ProviderUtils.bcProvider).build()
+ new JceCMSContentEncryptorBuilder(algorithm).setProvider(GeneratorModule_ProviderFactory.provider()).build()
  );
  }
 }
diff --git a/...ncryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java b/...ncryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java
diff --git a/...-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java b/...-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java
@@ -8,11 +8,11 @@
 import de.adorsys.datasafe.encrypiton.api.types.keystore.KeyStoreAuth;
 import de.adorsys.datasafe.encrypiton.api.types.keystore.PublicKeyIDWithPublicKey;
 import de.adorsys.datasafe.encrypiton.impl.KeystoreUtil;
-import de.adorsys.datasafe.encrypiton.impl.utils.ProviderUtils;
 import de.adorsys.datasafe.types.api.shared.BaseMockitoTest;
 import de.adorsys.datasafe.types.api.types.ReadKeyPassword;
 import de.adorsys.datasafe.types.api.types.ReadStorePassword;
 import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory;
+import de.adorsys.keymanagement.adapter.modules.generator.GeneratorModule_ProviderFactory;
 import de.adorsys.keymanagement.api.Juggler;
 import de.adorsys.keymanagement.api.config.keystore.KeyStoreConfig;
 import de.adorsys.keymanagement.api.types.KeySetTemplate;
@@ -59,7 +59,7 @@ void createKeyStore() throws Exception {
  Assertions.assertEquals(4, list.size());
 
  Assertions.assertEquals("BCFKS", keyStore.getType());
- Assertions.assertEquals(ProviderUtils.bcProvider, keyStore.getProvider());
+ Assertions.assertEquals(GeneratorModule_ProviderFactory.provider(), keyStore.getProvider());
  }
 
  @Test