Skip to content

Commit 42d9e17

Browse files
authored
Merge pull request #4033 from silbermannnn/release-legacy-22-fix
feat: add support for other security providers on legacy-22 branch #3994
2 parents ee9fab2 + d0d4d7d commit 42d9e17

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

util/src/main/java/io/kubernetes/client/util/SSLUtils.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.security.KeyStoreException;
2525
import java.security.NoSuchAlgorithmException;
2626
import java.security.PrivateKey;
27+
import java.security.Provider;
2728
import java.security.Security;
2829
import java.security.UnrecoverableKeyException;
2930
import java.security.cert.Certificate;
@@ -32,6 +33,7 @@
3233
import java.security.cert.X509Certificate;
3334
import java.security.spec.InvalidKeySpecException;
3435
import java.util.Collection;
36+
import java.util.ServiceLoader;
3537
import javax.net.ssl.KeyManager;
3638
import javax.net.ssl.KeyManagerFactory;
3739
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -40,10 +42,18 @@
4042
import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
4143
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
4244
import org.bouncycastle.util.io.pem.PemWriter;
45+
import org.slf4j.Logger;
46+
import org.slf4j.LoggerFactory;
4347

4448
public class SSLUtils {
49+
private static final Logger log = LoggerFactory.getLogger(SSLUtils.class);
50+
4551
static {
46-
Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
52+
ServiceLoader<Provider> services = ServiceLoader.load(java.security.Provider.class);
53+
for (Provider service : services) {
54+
log.debug("Found security provider: " + service.getName());
55+
Security.addProvider(service);
56+
}
4757
}
4858

4959
public static boolean isNotNullOrEmpty(String val) {

0 commit comments

Comments
 (0)