From 392416f85aa5f9be86a288c8767641ee99c1d1f1 Mon Sep 17 00:00:00 2001 From: Takeshi Katae Date: Thu, 10 Sep 2015 14:30:09 +0900 Subject: Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318 Change-Id: I14b3bb9e6f7ce851a83792b5523d72510120dbbe Signed-off-by: Takeshi Katae --- crypto/src/test/java/org/conscrypt/NativeCryptoTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/src/test/java/org/conscrypt/NativeCryptoTest.java b/crypto/src/test/java/org/conscrypt/NativeCryptoTest.java index 1118a49..ca5f498 100644 --- a/crypto/src/test/java/org/conscrypt/NativeCryptoTest.java +++ b/crypto/src/test/java/org/conscrypt/NativeCryptoTest.java @@ -2054,7 +2054,7 @@ public class NativeCryptoTest extends TestCase { long engine = NativeCrypto.ENGINE_by_id("non-existent"); if (engine != 0) { - NativeCrypto.ENGINE_finish(engine); + NativeCrypto.ENGINE_free(engine); fail("should not acquire reference to non-existent engine"); } } @@ -2066,7 +2066,7 @@ public class NativeCryptoTest extends TestCase { public static void loadTestEngine() throws Exception { long testEngine = NativeCrypto.ENGINE_by_id(TEST_ENGINE_ID); if (testEngine != 0) { - NativeCrypto.ENGINE_finish(testEngine); + NativeCrypto.ENGINE_free(testEngine); return; } @@ -2096,14 +2096,14 @@ public class NativeCryptoTest extends TestCase { NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "ID", TEST_ENGINE_ID, 0)); assertEquals(1, NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "LOAD", null, 0)); } finally { - NativeCrypto.ENGINE_finish(dynEngine); + NativeCrypto.ENGINE_free(dynEngine); } testEngine = NativeCrypto.ENGINE_by_id(TEST_ENGINE_ID); if (testEngine == 0) { fail("could not load test engine"); } - NativeCrypto.ENGINE_finish(testEngine); + NativeCrypto.ENGINE_free(testEngine); } public void test_ENGINE_by_id_TestEngine() throws Exception { @@ -2112,6 +2112,7 @@ public class NativeCryptoTest extends TestCase { long engine = NativeCrypto.ENGINE_by_id(TEST_ENGINE_ID); assertTrue(engine != 0); NativeCrypto.ENGINE_add(engine); + NativeCrypto.ENGINE_init(engine); long pkey = NULL; try { -- cgit v1.1