Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Delete KM1"

Browse Source 
Revert "Delete KM1"

Revert "Delete KM1"

Revert "Delete KM1"

Revert submission 1844016-delkm1

Reason for revert: b/202675261
Reverted Changes:
Iba996962b:Delete KM1
Ia4c5359cd:Delete KM1
Iee6ec9816:Delete KM1
I6058e4d86:Delete KM1
I8abb9c570:Delete KM1
I9c4dc5c9e:Delete KM1

Change-Id: I2a2d4b737a90f8ce31cd14b68f64564d8d245ab3
This commit is contained in:
Jim Blackler
2021-10-11 13:38:59 +00:00
parent 50f70d73da
commit a08ea2d23f
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keymaster/3.0/default/Android.mk
View File

@@ -12,7 +12,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libpuresoftkeymasterdevice \
libsoftkeymasterdevice \
libcrypto \
libkeymaster_portable \
libpuresoftkeymasterdevice \

21
keymaster/3.0/default/KeymasterDevice.cpp
View File

@@ -22,6 +22,7 @@
#include <log/log.h>
#include <AndroidKeymaster3Device.h>
#include <hardware/keymaster1.h>
#include <hardware/keymaster2.h>
#include <hardware/keymaster_defs.h>
@@ -31,6 +32,18 @@ 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) {
@@ -50,8 +63,14 @@ static IKeymasterDevice* createKeymaster3Device() {
return ::keymaster::ng::CreateKeymasterDevice();
}
if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_2_0) {
if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_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)) {

7
keymaster/3.0/vts/functional/Android.bp
View File

@@ -36,10 +36,7 @@ cc_test {
static_libs: [
"android.hardware.keymaster@3.0",
"libcrypto_static",
"libpuresoftkeymasterdevice",
],
test_suites: [
"general-tests",
"vts",
"libsoftkeymasterdevice",
],
test_suites: ["general-tests", "vts"],
}

4
keymaster/4.0/vts/performance/Android.bp
View File

@@ -32,7 +32,7 @@ cc_benchmark {
static_libs: [
"android.hardware.keymaster@4.0",
"libkeymaster4support",
"libpuresoftkeymasterdevice",
"libchrome",
"libsoftkeymasterdevice",
"libchrome"
],
}