diff --git a/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java b/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java index ff46bbc440..06dcef01e8 100644 --- a/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java @@ -16,6 +16,7 @@ package io.netty.handler.ssl; import org.junit.BeforeClass; +import org.junit.Test; import javax.net.ssl.SSLException; @@ -43,6 +44,41 @@ public class JdkOpenSslEngineInteroptTest extends SSLEngineTest { return SslProvider.OPENSSL; } + @Override + @Test + public void testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth(); + } + + @Override + @Test + public void testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthValidClientCertChainTooLongFailRequireClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth(); + } + @Override protected void mySetupMutualAuthServerInitSslHandler(SslHandler handler) { ReferenceCountedOpenSslEngine engine = (ReferenceCountedOpenSslEngine) handler.engine(); diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java index f774ab4251..19411127cd 100644 --- a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java @@ -54,6 +54,41 @@ public class OpenSslEngineTest extends SSLEngineTest { assumeTrue(OpenSsl.isAvailable()); } + @Override + @Test + public void testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth(); + } + + @Override + @Test + public void testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthValidClientCertChainTooLongFailRequireClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth(); + } + @Test public void testNpn() throws Exception { ApplicationProtocolConfig apn = acceptingNegotiator(Protocol.NPN, diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java index 8d6f56dc6e..34c8d2762f 100644 --- a/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java @@ -17,6 +17,7 @@ package io.netty.handler.ssl; import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Test; import static org.junit.Assume.assumeTrue; @@ -50,4 +51,25 @@ public class OpenSslJdkSslEngineInteroptTest extends SSLEngineTest { @Override public void testMutualAuthValidClientCertChainTooLongFailRequireClientAuth() throws Exception { } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth(); + } + + @Override + @Test + public void testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth() throws Exception { + assumeTrue(OpenSsl.supportsKeyManagerFactory()); + super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth(); + } }