Repository: jclouds-labs Updated Branches: refs/heads/master 0b162816b -> 38ce54b94
Fix incorrect key format check in Docker Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/38ce54b9 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/38ce54b9 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/38ce54b9 Branch: refs/heads/master Commit: 38ce54b94c3545cc55fc158bf7ab486219f6d812 Parents: 0b16281 Author: Andrew Donald Kennedy <[email protected]> Authored: Thu Jun 16 20:02:14 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Fri Jun 17 00:01:35 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/38ce54b9/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java b/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java index cc1025b..2933f78 100644 --- a/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java +++ b/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java @@ -59,7 +59,7 @@ public class SSLContextBuilder { private TrustManager[] trustManagers; public static final boolean isClientKeyAndCertificateData(String key, String cert) { - return (key.startsWith(Pems.PUBLIC_X509_MARKER) || key.startsWith(Pems.PUBLIC_PKCS1_MARKER)) && + return (key.startsWith(Pems.PRIVATE_PKCS1_MARKER) || key.startsWith(Pems.PRIVATE_PKCS8_MARKER)) && cert.startsWith(Pems.CERTIFICATE_X509_MARKER); }
