Merge pull request #16285 from vespa-engine/balder/use-singleton

Use singleton already present.

2 files changed, 1 insertions, 9 deletions

diff --git a/jrt/src/com/yahoo/jrt/CryptoEngine.java b/jrt/src/com/yahoo/jrt/CryptoEngine.java
index 6d1955d7f66..318ee333fee 100644
--- a/jrt/src/com/yahoo/jrt/CryptoEngine.java
+++ b/jrt/src/com/yahoo/jrt/CryptoEngine.java
@@ -1,10 +1,7 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
-
-import com.yahoo.security.tls.AuthorizationMode;
 import com.yahoo.security.tls.MixedMode;
-import com.yahoo.security.tls.ConfigFileBasedTlsContext;
 import com.yahoo.security.tls.TlsContext;
 import com.yahoo.security.tls.TransportSecurityUtils;
 
@@ -24,8 +21,7 @@ public interface CryptoEngine extends AutoCloseable {
         if (!TransportSecurityUtils.isTransportSecurityEnabled()) {
             return new NullCryptoEngine();
         }
-        AuthorizationMode mode = TransportSecurityUtils.getInsecureAuthorizationMode();
-        TlsContext tlsContext = new ConfigFileBasedTlsContext(TransportSecurityUtils.getConfigFile().get(), mode);
+        TlsContext tlsContext = TransportSecurityUtils.getSystemTlsContext().get();
         TlsCryptoEngine tlsCryptoEngine = new TlsCryptoEngine(tlsContext);
         MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode();
         switch (mixedMode) {
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java b/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java
index def3e49be4d..d2a42d21973 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java
@@ -43,10 +43,6 @@ public class DefaultTlsContext implements TlsContext {
         this(sslContext, TlsContext.ALLOWED_CIPHER_SUITES, peerAuthentication);
     }
 
-    public DefaultTlsContext(SSLContext sslContext) {
-        this(sslContext, TlsContext.ALLOWED_CIPHER_SUITES, PeerAuthentication.NEED);
-    }
-
     DefaultTlsContext(SSLContext sslContext, Set<String> acceptedCiphers, PeerAuthentication peerAuthentication) {
         this.sslContext = sslContext;
         this.peerAuthentication = peerAuthentication;