diff options
| author | Kenny Root <kroot@google.com> | 2012-05-01 17:27:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-01 17:27:31 -0700 |
| commit | 1a42aa130cce5fd99e244d111a97d120b01e386b (patch) | |
| tree | 6c4fd1879c7eead1870533d8dc68ddfed9edfb30 | |
| parent | a2dc21a5bd556e7d9410562eb08a87b72ef289b5 (diff) | |
| parent | 90d9cc5b25f6684963bbbd1104b103786401dde6 (diff) | |
| download | device_samsung_tuna-1a42aa130cce5fd99e244d111a97d120b01e386b.zip device_samsung_tuna-1a42aa130cce5fd99e244d111a97d120b01e386b.tar.gz device_samsung_tuna-1a42aa130cce5fd99e244d111a97d120b01e386b.tar.bz2 | |
Merge "keymaster: set delete_all to NULL" into jb-dev
| -rw-r--r-- | keymaster/keymaster_tuna.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keymaster/keymaster_tuna.cpp b/keymaster/keymaster_tuna.cpp index fbc654f..15c56f2 100644 --- a/keymaster/keymaster_tuna.cpp +++ b/keymaster/keymaster_tuna.cpp @@ -903,6 +903,7 @@ static int tee_open(const hw_module_t* module, const char* name, dev->delete_keypair = tee_delete_keypair; dev->sign_data = tee_sign_data; dev->verify_data = tee_verify_data; + dev->delete_all = NULL; CK_RV initializeRV = C_Initialize(NULL); if (initializeRV != CKR_OK) { |