finish SSLContext creation by using KeyStore from HSM-Facade

1 files changed, 2 insertions, 6 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java
index b357bb01..eafd8a04 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpUtils.java
@@ -23,7 +23,6 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
-import java.security.Security;
 import java.security.UnrecoverableKeyException;
 
 import javax.annotation.Nonnull;
@@ -168,16 +167,14 @@ public class HttpUtils {
           : keyPasswordString.toCharArray();
 
       SSLContextBuilder sslContextBuilder = SSLContexts.custom();
-      if (keyStore.getSecond() != null) {        
+      if (keyStore.getSecond() != null) {
         Provider provider = new BouncyCastleJsseProvider(keyStore.getSecond());
-        
         log.debug("KeyStore: {} provide special security-provider. Inject: {} into SSLContext",
             friendlyName, provider.getName());
         sslContextBuilder.setProvider(provider);
-        Security.addProvider(provider);
-        //sslContextBuilder.setSecureRandom(SecureRandom.getInstanceStrong());
         
       }
+      
       if (StringUtils.isNotEmpty(keyAlias)) {
         sslContextBuilder = sslContextBuilder
             .loadKeyMaterial(keyStore.getFirst(), keyPassword, new EaafSslKeySelectionStrategy(keyAlias));
@@ -185,7 +182,6 @@ public class HttpUtils {
       } else {
         sslContextBuilder = sslContextBuilder
             .loadKeyMaterial(keyStore.getFirst(), keyPassword);
-
       }
 
       if (trustAllServerCertificates) {