diff options
| author | Kenny Root <kroot@google.com> | 2012-08-15 23:18:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-15 23:18:02 -0700 |
| commit | d3c598c12c1317f592b8da19e00c8122dba6b0c1 (patch) | |
| tree | bf1f6d0fc9f8ed4cd1f24b19da071d608f83801a | |
| parent | 65c1af4a3cbdbe11b17f57c7e47dc2848a5851e3 (diff) | |
| parent | e7f9da44646b8eb66ef2e7b163176b5272216e86 (diff) | |
| download | security-d3c598c12c1317f592b8da19e00c8122dba6b0c1.tar.gz | |
am e7f9da44: Merge "Clear out ENGINE flags when initializing"
* commit 'e7f9da44646b8eb66ef2e7b163176b5272216e86':
Clear out ENGINE flags when initializing
| -rw-r--r-- | keystore-engine/eng_keystore.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keystore-engine/eng_keystore.cpp b/keystore-engine/eng_keystore.cpp index ad2b6382..8a6df774 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; |