aboutsummaryrefslogtreecommitdiffstats
path: root/security-utils/src/main/java/com/yahoo/security/tls
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-05-28 18:31:38 +0200
committerGitHub <noreply@github.com>2020-05-28 18:31:38 +0200
commitab6c2c71d7d98120b09345b8e2cc59ec8374bb89 (patch)
tree78f5fcf60e8ce01af7c04b2b9b334ca0da4dbffb /security-utils/src/main/java/com/yahoo/security/tls
parentfd776f01675f8e86a03e07e98fd84cf5ba5f4372 (diff)
Revert "Expose underlying certificate and private key from SiaIdentityProvider "
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/AutoReloadingX509KeyManager.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/AutoReloadingX509KeyManager.java b/security-utils/src/main/java/com/yahoo/security/tls/AutoReloadingX509KeyManager.java
index d4e74e22e40..18764f51dc5 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/AutoReloadingX509KeyManager.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/AutoReloadingX509KeyManager.java
@@ -5,20 +5,19 @@ import com.yahoo.security.KeyStoreBuilder;
import com.yahoo.security.KeyStoreType;
import com.yahoo.security.KeyUtils;
import com.yahoo.security.X509CertificateUtils;
-import com.yahoo.security.X509CertificateWithKey;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.X509ExtendedKeyManager;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.Socket;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.security.KeyStore;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.time.Duration;
-import java.util.Arrays;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -60,13 +59,6 @@ public class AutoReloadingX509KeyManager extends X509ExtendedKeyManager implemen
return new AutoReloadingX509KeyManager(privateKeyFile, certificatesFile);
}
- public X509CertificateWithKey getCurrentCertificateWithKey() {
- X509ExtendedKeyManager manager = mutableX509KeyManager.currentManager();
- X509Certificate[] certificateChain = manager.getCertificateChain(CERTIFICATE_ALIAS);
- PrivateKey privateKey = manager.getPrivateKey(CERTIFICATE_ALIAS);
- return new X509CertificateWithKey(Arrays.asList(certificateChain), privateKey);
- }
-
private static KeyStore createKeystore(Path privateKey, Path certificateChain) {
try {
return KeyStoreBuilder.withType(KeyStoreType.PKCS12)