diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2019-01-15 13:11:51 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2019-01-15 13:29:26 +0100 |
commit | a294ea80e95e8469031997ad40fbb3fa5e5eb658 (patch) | |
tree | f278998e951f3ae5f22516928f5781febc127233 /security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java | |
parent | e207b1d597a2ba2a749a3337ed99d64788f5f9fd (diff) |
Add 'tls_client_tls_server' as tls mixed mode option
Also introduce default value for mixed mode.
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java index 1365a81cf10..2db0e35bcba 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java @@ -8,7 +8,8 @@ import java.util.Arrays; */ public enum MixedMode { PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"), - TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"); + TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"), + DISABLED("tls_client_tls_server"); final String configValue; @@ -20,6 +21,13 @@ public enum MixedMode { return configValue; } + /** + * @return Default value when mixed mode is not explicitly specified + */ + public static MixedMode defaultValue() { + return DISABLED; + } + static MixedMode fromConfigValue(String configValue) { return Arrays.stream(values()) .filter(v -> v.configValue.equals(configValue)) |