Support for client certificate chains

silme · silme · commit ed56bcdfd989 · 2020-04-20T20:27:36.000+03:00
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -89,11 +89,13 @@ public static List<Certificate> loadCertificates(final Reader reader) throws IOE
 
             JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter()
                     .setProvider(BouncyCastleProvider.PROVIDER_NAME);
-            Object certObj = pemParser.readObject();
+            Object certObj;
 
-            if (certObj instanceof X509CertificateHolder) {
-                X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
-                certificates.add(certificateConverter.getCertificate(certificateHolder));
+            while ((certObj = pemParser.readObject()) != null) {
+                if (certObj instanceof X509CertificateHolder) {
+                    X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
+                    certificates.add(certificateConverter.getCertificate(certificateHolder));
+                }
             }
 
             return certificates;
