Keystore 2.0: Remove Keystore 1.0 and remaining references
* Remove superseded keystore engine backends.
* Remove keystore_cli.
* Update keystoer_cli_v2 to use Keystore 2.0.
* Update confirmationui invocation test.
* Remove reference to enable keystore2 property from keystore2.rc.
Test: N/A
Bug: 171305684
Change-Id: I855dead9d95c2c8cfa451944087bc8290871c0e5
diff --git a/keystore/Android.bp b/keystore/Android.bp
index 7278cee..0f2000c 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -35,97 +35,6 @@
}
cc_binary {
- name: "keystore",
- defaults: ["keystore_defaults"],
-
- srcs: [
- "KeyStore.cpp",
- "auth_token_table.cpp",
- "blob.cpp",
- "confirmation_manager.cpp",
- "grant_store.cpp",
- "key_creation_log_handler.cpp",
- "key_operation_log_handler.cpp",
- "key_attestation_log_handler.cpp",
- "key_store_service.cpp",
- "keyblob_utils.cpp",
- "keymaster_enforcement.cpp",
- "keymaster_worker.cpp",
- "keystore_main.cpp",
- "keystore_utils.cpp",
- "legacy_keymaster_device_wrapper.cpp",
- "operation.cpp",
- "permissions.cpp",
- "user_state.cpp",
- ],
- shared_libs: [
- "android.hardware.confirmationui@1.0",
- "android.hardware.keymaster@3.0",
- "android.hardware.keymaster@4.0",
- "android.hardware.keymaster@4.1",
- "libbase",
- "libbinder",
- "libcrypto",
- "libcutils",
- "libhardware",
- "libhidlbase",
- "libkeymaster4support",
- "libkeymaster4_1support",
- "libkeymaster_messages",
- "libkeymaster_portable",
- "libkeystore-attestation-application-id",
- "libkeystore_aidl",
- "libkeystore_binder",
- "libkeystore_parcelables",
- "liblog",
- "libprotobuf-cpp-lite",
- "libselinux",
- "libservices",
- "libsoftkeymasterdevice",
- "libutils",
- "libstatslog",
- ],
- init_rc: ["keystore.rc"],
- aidl: {
- include_dirs: ["frameworks/base/core/java/"],
- },
-
- product_variables: {
- pdk: {
- enabled: false,
- },
- debuggable: {
- cflags: [
- // Allow VTS tests running as root to have
- // additional permissions.
- "-DGRANT_ROOT_ALL_PERMISSIONS",
- ],
- },
- },
-
- required: ["keystore_cli_v2"],
-}
-
-cc_binary {
- name: "keystore_cli",
- defaults: ["keystore_defaults"],
-
- srcs: ["keystore_cli.cpp"],
- shared_libs: [
- "android.hardware.keymaster@4.0",
- "libbinder",
- "libcrypto",
- "libcutils",
- "libhidlbase",
- "libkeystore_aidl", // for IKeyStoreService.asInterface()
- "libkeystore_binder",
- "libkeystore_parcelables",
- "liblog",
- "libutils",
- ],
-}
-
-cc_binary {
name: "keystore_cli_v2",
defaults: ["keystore_defaults"],
@@ -133,95 +42,25 @@
"-DKEYMASTER_NAME_TAGS",
"-Wno-unused-parameter",
],
- srcs: ["keystore_cli_v2.cpp"],
+ srcs: [
+ "keystore_cli_v2.cpp",
+ "keystore_client.proto",
+ ],
shared_libs: [
- "android.hardware.confirmationui@1.0",
+ "android.security.apc-ndk_platform",
+ "android.system.keystore2-V1-ndk_platform",
"libbinder",
- "android.hardware.keymaster@4.0",
+ "libbinder_ndk",
"libchrome",
+ "libcrypto",
+ "libkeymint_support",
+ "libprotobuf-cpp-lite",
"libutils",
- "libhidlbase",
- "libkeymaster4support",
- "libkeystore_aidl",
- "libkeystore_binder",
- "libkeystore_parcelables",
],
local_include_dirs: ["include"],
}
-cc_library_shared {
- name: "libkeystore_parcelables",
- defaults: ["keystore_defaults"],
- export_include_dirs: ["include"],
- srcs: [
- "KeymasterArguments.cpp",
- "keystore_aidl_hidl_marshalling_utils.cpp",
- "KeystoreResponse.cpp",
- "OperationResult.cpp",
- ],
- shared_libs: [
- "android.hardware.keymaster@4.0",
- "android.hardware.keymaster@4.1",
- "libbinder",
- "libhardware",
- "libhidlbase",
- "libkeymaster4support",
- "libkeymaster4_1support",
- "liblog",
- "libprotobuf-cpp-lite",
- "libutils",
- "libkeystore-attestation-application-id",
- ],
- export_shared_lib_headers: [
- "android.hardware.keymaster@4.0",
- "android.hardware.keymaster@4.1",
- "libbinder",
- "libhidlbase",
- "libkeymaster4_1support",
- ],
-}
-// Library for keystore clients
-cc_library_shared {
- name: "libkeystore_binder",
- defaults: ["keystore_defaults"],
-
- srcs: [
- "keyblob_utils.cpp",
- "keystore_client.proto",
- "keystore_client_impl.cpp",
- "keystore_get.cpp",
- ],
- shared_libs: [
- "android.hardware.keymaster@4.0",
- "libbinder",
- "libhidlbase",
- "libkeymaster4support",
- "libkeystore_aidl",
- "libkeystore_parcelables",
- "liblog",
- "libprotobuf-cpp-lite",
- "libutils",
- ],
-
- proto: {
- type: "lite",
- export_proto_headers: true,
- },
- aidl: {
- export_aidl_headers: true,
- include_dirs: ["frameworks/base/core/java/"],
- },
- export_include_dirs: ["include"],
- export_shared_lib_headers: [
- "android.hardware.keymaster@4.0",
- "libbinder",
- "libhidlbase",
- "libkeystore_aidl",
- "libkeystore_parcelables",
- ],
-}
-
// Library used by both keystore and credstore for generating the ASN.1 stored
// in Tag::ATTESTATION_APPLICATION_ID
cc_library_shared {
@@ -265,77 +104,3 @@
vendor: true,
}
-
-// Library for unit tests
-cc_library_static {
- name: "libkeystore_test",
- defaults: ["keystore_defaults"],
-
- srcs: [
- "auth_token_table.cpp",
- "blob.cpp",
- ],
- cflags: [ "-O0", ],
- static_libs: ["libgtest_main"],
- shared_libs: [
- "android.hardware.keymaster@4.0",
- "libbinder",
- "libcrypto",
- "libhidlbase",
- "libkeymaster4support",
- "libkeystore-attestation-application-id",
- "libutils",
- "libkeystore_aidl",
- "libkeystore_parcelables",
- ],
- export_shared_lib_headers: [
- "android.hardware.keymaster@4.0",
- "libhidlbase",
- "libkeymaster4support",
- ],
-
- aidl: {
- include_dirs: ["frameworks/base/core/java/"],
- },
- export_include_dirs: ["include"],
-}
-
-filegroup {
- name: "keystore_aidl",
- srcs: [
- "binder/android/security/IConfirmationPromptCallback.aidl",
- "binder/android/security/keystore/ICredstoreTokenCallback.aidl",
- "binder/android/security/keystore/IKeystoreCertificateChainCallback.aidl",
- "binder/android/security/keystore/IKeystoreExportKeyCallback.aidl",
- "binder/android/security/keystore/IKeystoreKeyCharacteristicsCallback.aidl",
- "binder/android/security/keystore/IKeystoreOperationResultCallback.aidl",
- "binder/android/security/keystore/IKeystoreResponseCallback.aidl",
- "binder/android/security/keystore/IKeystoreService.aidl",
- ],
- path: "binder",
-}
-
-cc_library_shared {
- name: "libkeystore_aidl",
- srcs: [":keystore_aidl"],
- aidl: {
- export_aidl_headers: true,
- include_dirs: [
- "system/security/keystore/binder",
- ],
- },
- shared_libs: [
- "libbinder",
- "libcutils",
- "libhardware",
- "libhidlbase",
- "libkeystore_parcelables",
- "liblog",
- "libselinux",
- "libutils",
- ],
- export_shared_lib_headers: [
- "libbinder",
- "libkeystore_parcelables",
- ],
-}