commit 50f70d73da3a86adb1f7b2fc4a8e8ec2fd62ec57
author Shawn Willden <swillden@google.com> Thu Oct 07 09:15:38 2021 -0600
committer Shawn Willden <swillden@google.com> Thu Oct 07 09:43:32 2021 -0600
tree 6137a83411caa5ef971091b7d70e5c78324ce75b
parent e1152b63909c9c58ea7ce58e3427cd4013669c34

Delete KM1

Test: Build
Change-Id: Iee6ec98163dff3a969debd9f4343c7b06ebe8d4f

keymaster/3.0/default/Android.mk

diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 053ad67..0c4e3c5 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -12,7 +12,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     liblog \
-    libsoftkeymasterdevice \
+    libpuresoftkeymasterdevice \
     libcrypto \
     libkeymaster_portable \
     libpuresoftkeymasterdevice \

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 8b416c3..25f16b5 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 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 @@
         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)) {