You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/01/29 11:34:15 UTC
git commit: updated refs/heads/master to 0d74d7b
Repository: cloudstack
Updated Branches:
refs/heads/master fa76b3c9f -> 0d74d7bde
use a preferable protocol that works on most infra
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit f5f6c2d1a74444bbbf5a5f4565953b6410b87a5c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
(cherry picked from commit 1bab1d0855f8813a54028aa58715db75d9c06ca0)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d74d7bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d74d7bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d74d7bd
Branch: refs/heads/master
Commit: 0d74d7bdea35bd2d133ea627b7421babc5a684b6
Parents: fa76b3c
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 28 13:41:00 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Jan 29 16:03:29 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/0d74d7bd/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 25ecb75..bd414db 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 synchronized static void setVirtualHost(String virtualHost) {
RabbitMQEventBus.virtualHost = virtualHost;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d74d7bd/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 100644
--- 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/0d74d7bd/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);
}
}