summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-08-15 22:19:25 -0700
committerKenny Root <kroot@google.com>2012-08-15 22:29:23 -0700
commit938a991106a9bd064eb2ede1fb46d9c2ef94c1be (patch)
tree7576f075f910951f05c70f232aab43a7acdd75ad
parentaa8467e59b561f454ff7ec902aae688145d8d297 (diff)
downloadsystem_security-938a991106a9bd064eb2ede1fb46d9c2ef94c1be.zip
system_security-938a991106a9bd064eb2ede1fb46d9c2ef94c1be.tar.gz
system_security-938a991106a9bd064eb2ede1fb46d9c2ef94c1be.tar.bz2
Clear out ENGINE flags when initializing
We don't need our engine to be copied when initialized with ENGINE_by_id, so just make sure our flags are cleared when we initialize. Change-Id: Ie75fad37c2f78a769c425889c1d0661b468cd0c7
-rw-r--r--keystore-engine/eng_keystore.cpp1
1 files changed, 1 insertions, 0 deletions
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 @@ static int keystore_engine_setup(ENGINE* e) {
|| !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;