From 94f2748f1b76237a513783ac1fdb5aef4b622a21 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Sun, 14 Feb 2016 21:34:50 -0800
Subject: [PATCH] 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.
---
 .../test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java  | 2 ++
 pom.xml                                                         | 2 +-
 .../transport/socket/SocketSslClientRenegotiateTest.java        | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java
index 7b660b4e97..c7717963f7 100644
--- a/handler/src/test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java
@@ -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();
     }
diff --git a/pom.xml b/pom.xml
index 1573c711f5..db10f66126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
index f4a0ab8611..83bf0d73c6 100644
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
+++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSslClientRenegotiateTest.java
@@ -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();
     }