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

SocketSslEchoTest failure

Browse Source 
Motivation:
8ba5b5f740 removed some ciphers from the default list, and SocketSslEchoTest had one of these ciphers hard coded in the test. The test will fail if the cihper is not supported by default.

Modifications:
SocketSslEchoTest should ensure a cipher is used which will be supported by the peer

Result:
Test result no longer depends upon default cipher list.
This commit is contained in:
Scott Mitchell 2016-10-11 15:48:21 -07:00
parent 8ba5b5f740
commit 7e62f9fcdb
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
View File

@ -45,7 +45,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import javax.net.ssl.SSLEngine;
import java.io.File;
import java.io.IOException;
import java.security.cert.CertificateException;
@ -57,6 +56,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.net.ssl.SSLEngine;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.is;
@ -148,11 +148,19 @@ public class SocketSslEchoTest extends AbstractSocketTest {
continue;
}
Renegotiation r;
if (rt == RenegotiationType.NONE) {
r = Renegotiation.NONE;
} else {
r = new Renegotiation(rt, "SSL_RSA_WITH_3DES_EDE_CBC_SHA");
final Renegotiation r;
switch (rt) {
case NONE:
r = Renegotiation.NONE;
break;
case SERVER_INITIATED:
r = new Renegotiation(rt, sc.cipherSuites().get(sc.cipherSuites().size() - 1));
break;
case CLIENT_INITIATED:
r = new Renegotiation(rt, cc.cipherSuites().get(cc.cipherSuites().size() - 1));
break;
default:
throw new Error();
}
for (int i = 0; i < 32; i++) {