You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2014/09/08 10:42:35 UTC
[1/2] git commit: Avoided to loop from 1 to 1024,
as we will never run this test under a priviledged user.
Repository: mina
Updated Branches:
refs/heads/2.0 81f55c8f6 -> 3cf5bcdc8
Avoided to loop from 1 to 1024, as we will never run this test under a
priviledged user.
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/1781aab8
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/1781aab8
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/1781aab8
Branch: refs/heads/2.0
Commit: 1781aab8d06a1b60e7e90386dd9aa1dee816a4d2
Parents: 81f55c8
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Sep 8 10:18:14 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Sep 8 10:18:14 2014 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/mina/transport/AbstractBindTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/1781aab8/mina-core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
----------------------------------------------------------------------
diff --git a/mina-core/src/test/java/org/apache/mina/transport/AbstractBindTest.java b/mina-core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
index e467b1f..c093c27 100644
--- a/mina-core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
+++ b/mina-core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
@@ -78,7 +78,7 @@ public abstract class AbstractBindTest {
// Let's start from port #1 to detect possible resource leak
// because test will fail in port 1-1023 if user run this test
// as a normal user.
- for (port = 1; port <= 65535; port++) {
+ for (port = 1024; port <= 65535; port++) {
socketBound = false;
try {
acceptor.setDefaultLocalAddress(createSocketAddress(port));
[2/2] git commit: Added the supported ciphers in the SSLHandler (see
DIRMINA-760)
Posted by el...@apache.org.
Added the supported ciphers in the SSLHandler (see DIRMINA-760)
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/3cf5bcdc
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/3cf5bcdc
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/3cf5bcdc
Branch: refs/heads/2.0
Commit: 3cf5bcdc800db329400193f24afa0613b7d3178e
Parents: 1781aab
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Sep 8 10:42:05 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Sep 8 10:42:05 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/mina/filter/ssl/SslFilter.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/3cf5bcdc/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index 7f656d2..e5f65b4 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -424,6 +424,11 @@ public class SslFilter extends IoFilterAdapter {
// Create a SSL handler and start handshake.
SslHandler sslHandler = new SslHandler(this, session);
sslHandler.init();
+
+ // Adding the supported ciphers in the SSLHandler
+ String[] ciphers = sslContext.getSupportedSSLParameters().getCipherSuites();
+
+ setEnabledCipherSuites(ciphers);
session.setAttribute(SSL_HANDLER, sslHandler);
}