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
The following commit(s) were added to refs/heads/bugfix/DIRMINA1132 by this
push:
new 4c13d27 certs cleanup
4c13d27 is described below
commit 4c13d27bf5a4d7edd84f66387bf07e53eb9c70c5
Author: Jonathan Valliere <john...@apache.org>
AuthorDate: Mon Jul 26 12:36:09 2021 -0400
certs cleanup
---
.../org/apache/mina/filter/ssl2/SSL2Handler.java | 7 +++++
.../org/apache/mina/filter/ssl2/SSL2HandlerG0.java | 31 +++++++++++++++------
.../apache/mina/filter/ssl2/SSL2SimpleTest.java | 12 ++++----
.../filter/ssl2/{keystore.sslTest => keystore.jks} | Bin
.../ssl2/{truststore.sslTest => truststore.jks} | Bin
5 files changed, 37 insertions(+), 13 deletions(-)
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Handler.java
b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Handler.java
index 3329b8e..cdf186e 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Handler.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2Handler.java
@@ -67,6 +67,13 @@ public abstract class SSL2Handler {
*/
protected IoBuffer mReceiveBuffer;
+ /**
+ * Instantiates a new handler
+ *
+ * @param p engine
+ * @param e executor
+ * @param s session
+ */
public SSL2Handler(SSLEngine p, Executor e, IoSession s) {
this.mEngine = p;
this.mExecutor = e;
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2HandlerG0.java
b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2HandlerG0.java
index 8f4e8d6..bf2fd6d 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2HandlerG0.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl2/SSL2HandlerG0.java
@@ -39,6 +39,13 @@ public class SSL2HandlerG0 extends SSL2Handler {
*/
protected boolean mHandshakeStarted = false;
+ /**
+ * Instantiates a new handler
+ *
+ * @param p engine
+ * @param e executor
+ * @param s session
+ */
public SSL2HandlerG0(SSLEngine p, Executor e, IoSession s) {
super(p, e, s);
}
@@ -95,12 +102,11 @@ public class SSL2HandlerG0 extends SSL2Handler {
/**
* Process a received message
*
- * @param message received data
- * @param session user session
- * @param next filter
+ * @param next
+ * @param message
+ *
* @throws SSLException
*/
- @SuppressWarnings("incomplete-switch")
protected void qreceive(final NextFilter next, final IoBuffer message)
throws SSLException {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} qreceive() - source {}", toString(),
message);
@@ -210,11 +216,12 @@ public class SSL2HandlerG0 extends SSL2Handler {
/**
* Attempts to encode the WriteRequest and write the data to the
IoSession
*
- * @param request
- * @param session
* @param next
+ * @param request
+ *
* @return {@code true} if the WriteRequest was fully consumed;
otherwise
* {@code false}
+ *
* @throws SSLException
*/
@SuppressWarnings("incomplete-switch")
@@ -237,11 +244,13 @@ public class SSL2HandlerG0 extends SSL2Handler {
dest.free();
} else {
if (result.bytesConsumed() == 0) {
+ // an handshaking message must have been
produced
EncryptedWriteRequest encrypted = new
EncryptedWriteRequest(dest, null);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("{} qwrite() - result {}",
toString(), encrypted);
}
next.filterWrite(this.mSession, encrypted);
+ // do not return because we want to enter the
handshake switch
} else {
// then we probably consumed some data
dest.flip();
@@ -266,6 +275,7 @@ public class SSL2HandlerG0 extends SSL2Handler {
next.filterWrite(this.mSession,
encrypted);
return true;
}
+ // we return because there is not reason to
enter the handshake switch
}
}
@@ -299,9 +309,10 @@ public class SSL2HandlerG0 extends SSL2Handler {
/**
* Attempts to generate a handshake message and write the data to the
IoSession
*
- * @param session
* @param next
+ *
* @return {@code true} if a message was generated and written
+ *
* @throws SSLException
*/
synchronized protected boolean qwrite(NextFilter next) throws
SSLException {
@@ -321,9 +332,12 @@ public class SSL2HandlerG0 extends SSL2Handler {
* If FAST_HANDSHAKE is enabled, this method will recursively loop in
order to
* combine multiple messages into one buffer.
*
- * @param session
* @param next
+ * @param source
+ * @param dest
+ *
* @return {@code true} if a message was generated and written
+ *
* @throws SSLException
*/
@SuppressWarnings("incomplete-switch")
@@ -418,6 +432,7 @@ public class SSL2HandlerG0 extends SSL2Handler {
* Flushes the encode queue
*
* @param next
+ *
* @throws SSLException
*/
synchronized protected void lflush(final NextFilter next) throws
SSLException {
diff --git
a/mina-core/src/test/java/org/apache/mina/filter/ssl2/SSL2SimpleTest.java
b/mina-core/src/test/java/org/apache/mina/filter/ssl2/SSL2SimpleTest.java
index 8896875..ce1a310 100644
--- a/mina-core/src/test/java/org/apache/mina/filter/ssl2/SSL2SimpleTest.java
+++ b/mina-core/src/test/java/org/apache/mina/filter/ssl2/SSL2SimpleTest.java
@@ -31,7 +31,7 @@ public class SSL2SimpleTest {
public static void main(String[] args) throws NoSuchAlgorithmException,
KeyManagementException, KeyStoreException,
UnrecoverableKeyException, CertificateException,
IOException {
- // System.setProperty("javax.net.debug", "all");
+ System.setProperty("javax.net.debug", "all");
KeyManagerFactory kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
TrustManagerFactory tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -39,13 +39,15 @@ public class SSL2SimpleTest {
KeyStore ks = KeyStore.getInstance("JKS");
KeyStore ts = KeyStore.getInstance("JKS");
-
ks.load(SslDIRMINA937Test.class.getResourceAsStream("keystore.sslTest"),
"password".toCharArray());
-
ts.load(SslDIRMINA937Test.class.getResourceAsStream("truststore.sslTest"),
"password".toCharArray());
+ final char[] password = "password".toCharArray();
- kmf.init(ks, "password".toCharArray());
+
ks.load(SSL2SimpleTest.class.getResourceAsStream("keystore.jks"), password);
+
ts.load(SSL2SimpleTest.class.getResourceAsStream("truststore.jks"), password);
+
+ kmf.init(ks, password);
tmf.init(ts);
- final SSLContext context = SSLContext.getInstance("TLS");
+ final SSLContext context = SSLContext.getInstance("TLSv1.3");
context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new
SecureRandom());
final SSL2Filter filter = new SSL2Filter(context);
diff --git
a/mina-core/src/test/resources/org/apache/mina/filter/ssl2/keystore.sslTest
b/mina-core/src/test/resources/org/apache/mina/filter/ssl2/keystore.jks
similarity index 100%
rename from
mina-core/src/test/resources/org/apache/mina/filter/ssl2/keystore.sslTest
rename to mina-core/src/test/resources/org/apache/mina/filter/ssl2/keystore.jks
diff --git
a/mina-core/src/test/resources/org/apache/mina/filter/ssl2/truststore.sslTest
b/mina-core/src/test/resources/org/apache/mina/filter/ssl2/truststore.jks
similarity index 100%
rename from
mina-core/src/test/resources/org/apache/mina/filter/ssl2/truststore.sslTest
rename to
mina-core/src/test/resources/org/apache/mina/filter/ssl2/truststore.jks
