From 52f84e4d323229e529ebbdc16d4d36d48bbd8d3c Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Wed, 19 Feb 2025 13:26:52 +0100 Subject: [PATCH] Revert "Support ssl context with multiple key/cert pairs" --- .../com/yahoo/security/SslContextBuilder.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java index d66712e9bd48..8fecbb72a433 100644 --- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java @@ -68,22 +68,9 @@ public SslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate cer } public SslContextBuilder withKeyStore(PrivateKey privateKey, List certificates) { - return withKeyStore(List.of(new X509CertificateWithKey(certificates, privateKey))); - } - - public SslContextBuilder withKeyStore(List clientCertificatesAndKeys) { - if (clientCertificatesAndKeys.isEmpty()) { - throw new IllegalArgumentException("clientCertificatesAndKeys cannot be empty"); - } - this.keyStoreSupplier = () -> { - KeyStoreBuilder keyStore = KeyStoreBuilder.withType(KeyStoreType.JKS); - for (int i = 0; i < clientCertificatesAndKeys.size(); i++) { - X509CertificateWithKey certWithKey = clientCertificatesAndKeys.get(i); - keyStore = keyStore.withKeyEntry("key"+i, certWithKey.privateKey(), certWithKey.certificate()); - } - return keyStore.build(); - }; - this.keyStorePassword = new char[0]; + char[] pwd = new char[0]; + this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificates).build(); + this.keyStorePassword = pwd; return this; }