Return default values when env vars are not present

1 files changed, 4 insertions, 5 deletions

diff --git a/jrt/src/com/yahoo/jrt/CryptoEngine.java b/jrt/src/com/yahoo/jrt/CryptoEngine.java
index 0d1dfe8a22b..41a567a83f2 100644
--- a/jrt/src/com/yahoo/jrt/CryptoEngine.java
+++ b/jrt/src/com/yahoo/jrt/CryptoEngine.java
@@ -23,14 +23,13 @@ public interface CryptoEngine extends AutoCloseable {
         if (!TransportSecurityUtils.isTransportSecurityEnabled()) {
             return new NullCryptoEngine();
         }
-        AuthorizationMode mode = TransportSecurityUtils.getInsecureAuthorizationMode().orElse(AuthorizationMode.ENFORCE);
+        AuthorizationMode mode = TransportSecurityUtils.getInsecureAuthorizationMode();
         TlsContext tlsContext = new ReloadingTlsContext(TransportSecurityUtils.getConfigFile().get(), mode);
         TlsCryptoEngine tlsCryptoEngine = new TlsCryptoEngine(tlsContext);
-        if (!TransportSecurityUtils.isInsecureMixedModeEnabled()) {
-            return tlsCryptoEngine;
-        }
-        MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode().get();
+        MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode();
         switch (mixedMode) {
+            case DISABLED:
+                return tlsCryptoEngine;
             case PLAINTEXT_CLIENT_MIXED_SERVER:
                 return new MaybeTlsCryptoEngine(tlsCryptoEngine, false);
             case TLS_CLIENT_MIXED_SERVER: