Repository: cloudstack Updated Branches: refs/heads/4.3 1ef12f414 -> f5f6c2d1a
use a preferable protocol that works on jvm 1.6 Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5f6c2d1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f5f6c2d1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f5f6c2d1 Branch: refs/heads/4.3 Commit: f5f6c2d1a74444bbbf5a5f4565953b6410b87a5c Parents: 1ef12f4 Author: Rohit Yadav <[email protected]> Authored: Wed Jan 28 13:41:00 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Jan 28 13:41:00 2015 +0530 ---------------------------------------------------------------------- .../org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 2 +- .../rdpconsole/src/main/java/streamer/SocketWrapperImpl.java | 5 +---- utils/src/org/apache/cloudstack/utils/security/SSLUtils.java | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5f6c2d1/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 8e24c03..fc48b38 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 @@ -47,7 +47,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/f5f6c2d1/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 4db8bee..85c1f23 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,9 +48,6 @@ public class SocketWrapperImpl extends PipelineImpl implements SocketWrapper { protected SSLSocket sslSocket; - protected String SSL_VERSION_TO_USE = "TLSv1.2"; - //protected String SSL_VERSION_TO_USE = "SSLv3"; - protected SSLState sslState; public SocketWrapperImpl(String id, SSLState sslState) { @@ -135,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(SSL_VERSION_TO_USE); + 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/f5f6c2d1/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); } }
