Upgrade to netty-tcnative-1.1.33.Fork13

Motivation:

netty-tcnative-1.1.33.Fork was released, we should upgrade. Also we should skip renegotiate tests if boringssl is used because boringssl does not support renegotiation.

Modifications:

- Upgrade to netty-tcnative-1.1.33.Fork13
- Skip renegotiate tests if boringssl is used.

Result:

Use newest version of netty-tcnative and be able to build if boringssl is used.
This commit is contained in:
Norman Maurer 2016-02-14 21:34:50 -08:00
parent 9f5b2c51b7
commit 4f460a1680
3 changed files with 5 additions and 1 deletions

View File

@ -21,6 +21,8 @@ public class OpenSslRenegotiateTest extends RenegotiateTest {
@Override
public void testRenegotiateServer() throws Throwable {
// BoringSSL does not support renegotiation intentionally.
Assume.assumeFalse("BoringSSL".equals(OpenSsl.versionString()));
Assume.assumeTrue(OpenSsl.isAvailable());
super.testRenegotiateServer();
}

View File

@ -223,7 +223,7 @@
<!-- Fedora-"like" systems. This is currently only used for the netty-tcnative dependency -->
<os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
<tcnative.artifactId>netty-tcnative</tcnative.artifactId>
<tcnative.version>1.1.33.Fork12</tcnative.version>
<tcnative.version>1.1.33.Fork13</tcnative.version>
<tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
<epoll.classifier>${os.detected.name}-${os.detected.arch}</epoll.classifier>
</properties>

View File

@ -121,6 +121,8 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest {
@Test(timeout = 30000)
public void testSslRenegotiationRejected() throws Throwable {
// BoringSSL does not support renegotiation intentionally.
Assume.assumeFalse("BoringSSL".equals(OpenSsl.versionString()));
Assume.assumeTrue(OpenSsl.isAvailable());
run();
}