From fb3dc84e5b032323d842e07880f4b045a4fd459b Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 16 Aug 2016 13:42:09 +0200 Subject: [PATCH] Only run PemEncodedTest if OpenSsl.useKeyManagerFactory() returns false. Motivation: Commit b963595988d729e83cedddb180a5e24085b9e494 added a unit that will not work when KeyManagerFactory is used. Modifications: Only run the test if OpenSsl.useKeyManagerFactory() returns false. Result: Builds with boringssl --- handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java b/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java index 0939f7c1e5..793f772287 100644 --- a/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/PemEncodedTest.java @@ -18,6 +18,7 @@ package io.netty.handler.ssl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; import java.io.ByteArrayOutputStream; @@ -43,6 +44,7 @@ public class PemEncodedTest { private static void testPemEncoded(SslProvider provider) throws Exception { assumeTrue(OpenSsl.isAvailable()); + assumeFalse(OpenSsl.useKeyManagerFactory()); PemPrivateKey pemKey; PemX509Certificate pemCert; SelfSignedCertificate ssc = new SelfSignedCertificate(); @@ -70,6 +72,7 @@ public class PemEncodedTest { private static void assertRelease(PemEncoded encoded) { assertTrue(encoded.release()); } + private static byte[] toByteArray(File file) throws Exception { FileInputStream in = new FileInputStream(file); try {