You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/08/30 09:36:04 UTC
[40/50] jclouds git commit: Fix incorrect key format check in Docker
Fix incorrect key format check in Docker
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/496fbae6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/496fbae6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/496fbae6
Branch: refs/heads/master
Commit: 496fbae646f6538be492db35d1dd54514aec5c55
Parents: 730a4cf
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Thu Jun 16 20:02:14 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
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/blob/496fbae6/apis/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java
----------------------------------------------------------------------
diff --git a/apis/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java b/apis/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java
index cc1025b..2933f78 100644
--- a/apis/docker/src/main/java/org/jclouds/docker/suppliers/SSLContextBuilder.java
+++ b/apis/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);
}