Skip tests that use KeyManagerFactory if not supported by OpenSSL version / flavor (#8662)

Motivation:

We missed to skip a few tests that depend on the KeyManagerFactory if the used OpenSSL version / flavor not support it.

Modifications:

Add missing overrides.

Result:

Testsuite also passes for example when using LibreSSL.
This commit is contained in:
Norman Maurer 2018-12-14 21:33:38 +01:00
parent 0efc47b69d
commit 7f20adb5fc
2 changed files with 21 additions and 0 deletions

View File

@ -100,6 +100,20 @@ public class JdkOpenSslEngineInteroptTest extends SSLEngineTest {
super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth(); super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth();
} }
@Override
@Test
public void testSessionAfterHandshakeKeyManagerFactoryMutualAuth() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
}
@Override
@Test
public void testSessionAfterHandshakeKeyManagerFactory() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSessionAfterHandshakeKeyManagerFactory();
}
@Override @Override
protected void mySetupMutualAuthServerInitSslHandler(SslHandler handler) { protected void mySetupMutualAuthServerInitSslHandler(SslHandler handler) {
ReferenceCountedOpenSslEngine engine = (ReferenceCountedOpenSslEngine) handler.engine(); ReferenceCountedOpenSslEngine engine = (ReferenceCountedOpenSslEngine) handler.engine();

View File

@ -112,6 +112,13 @@ public class OpenSslJdkSslEngineInteroptTest extends SSLEngineTest {
super.testClientHostnameValidationFail(); super.testClientHostnameValidationFail();
} }
@Override
@Test
public void testSessionAfterHandshakeKeyManagerFactoryMutualAuth() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
}
@Override @Override
protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) { protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) {
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException. // TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.