Fix #786: Key converter initialization should not be removed

wultra · Mar 26, 2020 · 738419d · 738419d
1 parent 952df75
commit 738419d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...ib/webflow/authentication/method/form/encryption/AesEncryptionPasswordProtectionTest.java b/...ib/webflow/authentication/method/form/encryption/AesEncryptionPasswordProtectionTest.java
@@ -17,7 +17,9 @@
 package io.getlime.security.powerauth.lib.webflow.authentication.method.form.encryption;
 
 import com.google.common.io.BaseEncoding;
+import io.getlime.security.powerauth.crypto.lib.config.PowerAuthConfiguration;
 import io.getlime.security.powerauth.lib.webflow.authentication.encryption.AesEncryptionPasswordProtection;
+import io.getlime.security.powerauth.provider.CryptoProviderUtilBouncyCastle;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,6 +40,7 @@ class AesEncryptionPasswordProtectionTest {
  @BeforeAll
  static void setUp() {
  Security.addProvider(new BouncyCastleProvider());
+ PowerAuthConfiguration.INSTANCE.setKeyConvertor(new CryptoProviderUtilBouncyCastle());
  }
 
  @org.junit.jupiter.api.Test

diff --git a/...h-webflow/src/main/java/io/getlime/security/powerauth/app/webflow/ServletInitializer.java b/...h-webflow/src/main/java/io/getlime/security/powerauth/app/webflow/ServletInitializer.java
@@ -15,6 +15,8 @@
  */
 package io.getlime.security.powerauth.app.webflow;
 
+import io.getlime.security.powerauth.crypto.lib.config.PowerAuthConfiguration;
+import io.getlime.security.powerauth.provider.CryptoProviderUtilFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -38,6 +40,9 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio
  // Register BC provider
  Security.addProvider(new BouncyCastleProvider());
 
+ // Tell PowerAuth components to use BC provider
+ PowerAuthConfiguration.INSTANCE.setKeyConvertor(CryptoProviderUtilFactory.getCryptoProviderUtils());
+
  return application.sources(PowerAuthWebFlowApplication.class);
  }