commit e7f9da44646b8eb66ef2e7b163176b5272216e86
author Kenny Root <kroot@google.com> Wed Aug 15 22:47:44 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 15 22:47:45 2012 -0700
tree bf1f6d0fc9f8ed4cd1f24b19da071d608f83801a
parent 593786c9b885a48a2674e3ebb5c3bab265de2e51
parent 938a991106a9bd064eb2ede1fb46d9c2ef94c1be

Merge "Clear out ENGINE flags when initializing"

keystore-engine/eng_keystore.cpp

diff --git a/keystore-engine/eng_keystore.cpp b/keystore-engine/eng_keystore.cpp
index ad2b638..8a6df77 100644
--- a/keystore-engine/eng_keystore.cpp
+++ b/keystore-engine/eng_keystore.cpp
@@ -281,6 +281,7 @@
             || !ENGINE_set_name(e, KEYSTORE_ENGINE_NAME)
             || !ENGINE_set_load_privkey_function(e, keystore_loadkey)
             || !ENGINE_set_load_pubkey_function(e, keystore_loadkey)
+            || !ENGINE_set_flags(e, 0)
             || !ENGINE_set_cmd_defns(e, keystore_cmd_defns)) {
         ALOGE("Could not set up keystore engine");
         return 0;