diff options
| author | Shawn Willden <swillden@google.com> | 2021-10-09 01:19:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-09 01:19:59 +0000 |
| commit | bb661ea9783a775f360ff8ff20d14943244960a6 (patch) | |
| tree | 1fb395f95ecb6eac2127f65bf3345f6039b71dc1 /keymaster | |
| parent | 6ffb3be9b7780f75e6d69c617e170918d67e0d80 (diff) | |
| parent | 9c379e224fa29c8ba170c220bdcfd54d0cdb2cea (diff) | |
Merge "Delete KM1" am: 13274fa22d am: 9c379e224f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I6d7acf78da1a57e078ffd21378d2021740633960
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/3.0/default/Android.mk | 2 | ||||
| -rw-r--r-- | keymaster/3.0/default/KeymasterDevice.cpp | 21 | ||||
| -rw-r--r-- | keymaster/3.0/vts/functional/Android.bp | 7 | ||||
| -rw-r--r-- | keymaster/4.0/vts/performance/Android.bp | 4 |
4 files changed, 9 insertions, 25 deletions
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk index 053ad671fb..0c4e3c569a 100644 --- a/keymaster/3.0/default/Android.mk +++ b/keymaster/3.0/default/Android.mk @@ -12,7 +12,7 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ liblog \ - libsoftkeymasterdevice \ + libpuresoftkeymasterdevice \ libcrypto \ libkeymaster_portable \ libpuresoftkeymasterdevice \ diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp index 8b416c3f9a..25f16b57df 100644 --- a/keymaster/3.0/default/KeymasterDevice.cpp +++ b/keymaster/3.0/default/KeymasterDevice.cpp @@ -22,7 +22,6 @@ #include <log/log.h> #include <AndroidKeymaster3Device.h> -#include <hardware/keymaster1.h> #include <hardware/keymaster2.h> #include <hardware/keymaster_defs.h> @@ -32,18 +31,6 @@ namespace keymaster { namespace V3_0 { namespace implementation { -static int get_keymaster1_dev(keymaster1_device_t** dev, const hw_module_t* mod) { - int rc = keymaster1_open(mod, dev); - if (rc) { - ALOGE("Error %d opening keystore keymaster1 device", rc); - if (*dev) { - (*dev)->common.close(&(*dev)->common); - *dev = nullptr; - } - } - return rc; -} - static int get_keymaster2_dev(keymaster2_device_t** dev, const hw_module_t* mod) { int rc = keymaster2_open(mod, dev); if (rc) { @@ -63,14 +50,8 @@ static IKeymasterDevice* createKeymaster3Device() { return ::keymaster::ng::CreateKeymasterDevice(); } - if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_0) { + if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_2_0) { return nullptr; - } else if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) { - keymaster1_device_t* dev = nullptr; - if (get_keymaster1_dev(&dev, mod)) { - return nullptr; - } - return ::keymaster::ng::CreateKeymasterDevice(dev); } else { keymaster2_device_t* dev = nullptr; if (get_keymaster2_dev(&dev, mod)) { diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp index e2ae80373f..6b75faa12f 100644 --- a/keymaster/3.0/vts/functional/Android.bp +++ b/keymaster/3.0/vts/functional/Android.bp @@ -36,7 +36,10 @@ cc_test { static_libs: [ "android.hardware.keymaster@3.0", "libcrypto_static", - "libsoftkeymasterdevice", + "libpuresoftkeymasterdevice", + ], + test_suites: [ + "general-tests", + "vts", ], - test_suites: ["general-tests", "vts"], } diff --git a/keymaster/4.0/vts/performance/Android.bp b/keymaster/4.0/vts/performance/Android.bp index d7342ad253..93b27bc44a 100644 --- a/keymaster/4.0/vts/performance/Android.bp +++ b/keymaster/4.0/vts/performance/Android.bp @@ -32,7 +32,7 @@ cc_benchmark { static_libs: [ "android.hardware.keymaster@4.0", "libkeymaster4support", - "libsoftkeymasterdevice", - "libchrome" + "libpuresoftkeymasterdevice", + "libchrome", ], } |