You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jo...@apache.org on 2021/08/02 03:41:00 UTC
[mina] 15/15: Adds missing null check for enabled
ciphersuites/protocols
This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a commit to branch bugfix/DIRMINA1132
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 4aa47296ac4cf0687b60597b268de3e25dd5b4dd
Author: Jonathan Valliere <jo...@apache.org>
AuthorDate: Sun Aug 1 10:11:12 2021 -0400
Adds missing null check for enabled ciphersuites/protocols
---
.../src/main/java/org/apache/mina/filter/ssl2/SSL2Filter.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Filter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Filter.java
index 4a35d2f..d5119ac 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Filter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Filter.java
@@ -217,8 +217,12 @@ public class SSL2Filter extends IoFilterAdapter {
SSLEngine e = mContext.createSSLEngine(s.getHostString(), s.getPort());
e.setNeedClientAuth(mNeedClientAuth);
e.setWantClientAuth(mWantClientAuth);
- e.setEnabledCipherSuites(mEnabledCipherSuites);
- e.setEnabledProtocols(mEnabledProtocols);
+ if (this.mEnabledCipherSuites != null) {
+ e.setEnabledCipherSuites(this.mEnabledCipherSuites);
+ }
+ if (this.mEnabledProtocols != null) {
+ e.setEnabledProtocols(this.mEnabledProtocols);
+ }
e.setUseClientMode(!session.isServer());
this.onEngineCreated(session, e);
x = new SSL2HandlerG0(e, EXECUTOR, session);
@@ -235,7 +239,7 @@ public class SSL2Filter extends IoFilterAdapter {
* @param engine
*/
protected void onEngineCreated(IoSession session, SSLEngine engine) {
-
+
}
/**