Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish...

Merge "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" into kitkat-cts-dev

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 {