Repository: cloudstack Updated Branches: refs/heads/4.4 f1cccf6fe -> 2a7454809
use a preferable protocol that works on jvm 1.6 Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit f5f6c2d1a74444bbbf5a5f4565953b6410b87a5c) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Conflicts: services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a745480 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a745480 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a745480 Branch: refs/heads/4.4 Commit: 2a74548093fddb790508d80dd4b12eb40c88f9f0 Parents: f1cccf6 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Wed Jan 28 13:41:00 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Jan 29 16:00:50 2015 +0530 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 2 +- .../rdpconsole/src/main/java/streamer/SocketWrapperImpl.java | 4 +--- utils/src/org/apache/cloudstack/utils/security/SSLUtils.java | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a745480/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java ---------------------------------------------------------------------- diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index a8dc63a..e0d3542 100644 --- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java @@ -59,7 +59,7 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus { private static Integer port; private static String username; private static String password; - private static String secureProtocol = "TLSv1.2"; + private static String secureProtocol = "TLSv1"; public static void setVirtualHost(String virtualHost) { RabbitMQEventBus.virtualHost = virtualHost; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a745480/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java ---------------------------------------------------------------------- diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java index 6d99628..14089ce 100755 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java @@ -48,8 +48,6 @@ public class SocketWrapperImpl extends PipelineImpl implements SocketWrapper { protected SSLSocket sslSocket; - protected String sslVersionToUse = "TLSv1.2"; - protected SSLState sslState; public SocketWrapperImpl(String id, SSLState sslState) { @@ -134,7 +132,7 @@ public class SocketWrapperImpl extends PipelineImpl implements SocketWrapper { // Use most secure implementation of SSL available now. // JVM will try to negotiate TLS1.2, then will fallback to TLS1.0, if // TLS1.2 is not supported. - SSLContext sslContext = SSLContext.getInstance(sslVersionToUse); + SSLContext sslContext = SSLUtils.getSSLContext(); // Trust all certificates (FIXME: insecure) sslContext.init(null, new TrustManager[] {new TrustAllX509TrustManager(sslState)}, null); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a745480/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java b/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java index 7f9ee77..3de4c50 100644 --- a/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java +++ b/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java @@ -42,10 +42,10 @@ public class SSLUtils { } public static SSLContext getSSLContext() throws NoSuchAlgorithmException { - return SSLContext.getInstance("TLSv1.2"); + return SSLContext.getInstance("TLSv1"); } public static SSLContext getSSLContext(String provider) throws NoSuchAlgorithmException, NoSuchProviderException { - return SSLContext.getInstance("TLSv1.2", provider); + return SSLContext.getInstance("TLSv1", provider); } }