andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we correctly call wrapEngine(...) during tests. (#8473)

Browse Source 
Motivation:

We should call wrapEngine(...) in our SSLEngineTest to correctly detect all errors in case of the OpenSSLEngine.

Modifications:

Add missing wrapEngine(...) calls.

Result:

More correct tests
This commit is contained in:
Norman Maurer 2018-11-08 15:22:33 +01:00 committed by GitHub
parent fd57d971d1
commit 8a24df88a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
View File

@ -969,7 +969,7 @@ public abstract class SSLEngineTest {
ch.config().setAllocator(new TestByteBufAllocator(ch.config().getAllocator(), type)); ch.config().setAllocator(new TestByteBufAllocator(ch.config().getAllocator(), type));
ChannelPipeline p = ch.pipeline(); ChannelPipeline p = ch.pipeline();
SSLEngine engine = serverSslCtx.newEngine(ch.alloc()); SSLEngine engine = wrapEngine(serverSslCtx.newEngine(ch.alloc()));
engine.setUseClientMode(false); engine.setUseClientMode(false);
engine.setNeedClientAuth(true); engine.setNeedClientAuth(true);
@ -1679,7 +1679,7 @@ public abstract class SSLEngineTest {
@Override @Override
protected void initChannel(Channel ch) throws Exception { protected void initChannel(Channel ch) throws Exception {
ch.config().setAllocator(new TestByteBufAllocator(ch.config().getAllocator(), type)); ch.config().setAllocator(new TestByteBufAllocator(ch.config().getAllocator(), type));
ch.pipeline().addLast(new SslHandler(clientSslCtx.newEngine(ch.alloc()))); ch.pipeline().addLast(new SslHandler(wrapEngine(clientSslCtx.newEngine(ch.alloc()))));
} }
}).connect(serverChannel.localAddress()).syncUninterruptibly().channel(); }).connect(serverChannel.localAddress()).syncUninterruptibly().channel();
@ -2649,7 +2649,7 @@ public abstract class SSLEngineTest {
try { try {
serverSslCtx = SslContextBuilder.forServer(cert.key(), cert.cert()).sslProvider(sslClientProvider()) serverSslCtx = SslContextBuilder.forServer(cert.key(), cert.cert()).sslProvider(sslClientProvider())
.ciphers(cipherList).build(); .ciphers(cipherList).build();
server = serverSslCtx.newEngine(UnpooledByteBufAllocator.DEFAULT); server = wrapEngine(serverSslCtx.newEngine(UnpooledByteBufAllocator.DEFAULT));
fail(); fail();
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
// expected when invalid cipher is used. // expected when invalid cipher is used.