diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-30 11:01:19 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-04-30 17:27:17 +0000 |
| commit | 9fd05a9a6299e9688c8fcf755516ea254868d187 (patch) | |
| tree | 36e20446a1d1809f2944fdc856925174fd899d87 | |
| parent | 7169a8470f6539036addf3c960b075af224e83e2 (diff) | |
| download | android_system_security-9fd05a9a6299e9688c8fcf755516ea254868d187.tar.gz android_system_security-9fd05a9a6299e9688c8fcf755516ea254868d187.tar.bz2 android_system_security-9fd05a9a6299e9688c8fcf755516ea254868d187.zip | |
Use SoftKeymasterDevice::keymaster_device rather than casting.
Also document that SoftKeymasterDevice should not be freed.
Change-Id: I027f137b0ffd474bb4b429691fe87eef6338b723
(cherry picked from commit 47a79ffad8333120870cb613fa4e75990b073026)
| -rw-r--r-- | keystore/keystore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp index ff08a0d..24c137a 100644 --- a/keystore/keystore.cpp +++ b/keystore/keystore.cpp @@ -132,8 +132,8 @@ out: static int fallback_keymaster_device_initialize(keymaster1_device_t** dev) { keymaster::SoftKeymasterDevice* softkeymaster = new keymaster::SoftKeymasterDevice(); - // SoftKeymasterDevice is designed to make this cast safe. - *dev = reinterpret_cast<keymaster1_device_t*>(softkeymaster); + *dev = softkeymaster->keymaster_device(); + // softkeymaster will be freed by *dev->close_device; don't delete here. return 0; } |