summaryrefslogtreecommitdiffstats
path: root/security-utils
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-07-04 16:39:19 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-07-04 16:39:19 +0200
commit9be462c4d7cddb4c4df29e8640cdfb6f22fa4e94 (patch)
tree2a3504dc85cc2afae5410d77741042cf6206f258 /security-utils
parentf57514d3e2855ff589ea742cf908f537da283a5d (diff)
Use current certificate manager to find certificate expiry
Diffstat (limited to 'security-utils')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java b/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
index efd4d8ece87..02a32f79971 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
@@ -50,6 +50,12 @@ public class MutableX509KeyManager extends X509ExtendedKeyManager {
}
}
+ public X509ExtendedKeyManager currentManager() {
+ synchronized (monitor) {
+ return currentManager;
+ }
+ }
+
@Override
public String[] getServerAliases(String keyType, Principal[] issuers) {
return updateAndGetThreadLocalManager()
@@ -117,5 +123,4 @@ public class MutableX509KeyManager extends X509ExtendedKeyManager {
return manager;
}
}
-
}