Align KeyMint AIDL with usage
- Make HardwareAuthToken nullable on begin()
- Drop unused vestigial performOperation() entrypoint
Test: TreeHugger, VtsKeyMintAidlTargetTest (CF)
Change-Id: I227a91805d67567d551d40db5c70d2260dbbc570
diff --git a/guest/hals/keymint/remote/remote_keymint_device.cpp b/guest/hals/keymint/remote/remote_keymint_device.cpp
index c9171c8..a98f490 100644
--- a/guest/hals/keymint/remote/remote_keymint_device.cpp
+++ b/guest/hals/keymint/remote/remote_keymint_device.cpp
@@ -358,11 +358,10 @@
return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
}
-ScopedAStatus RemoteKeyMintDevice::begin(KeyPurpose purpose,
- const vector<uint8_t>& keyBlob,
- const vector<KeyParameter>& params,
- const HardwareAuthToken& authToken,
- BeginResult* result) {
+ScopedAStatus RemoteKeyMintDevice::begin(
+ KeyPurpose purpose, const vector<uint8_t>& keyBlob,
+ const vector<KeyParameter>& params,
+ const optional<HardwareAuthToken>& authToken, BeginResult* result) {
BeginOperationRequest request(impl_.message_version());
request.purpose = legacy_enum_conversion(purpose);
request.SetKeyMaterial(keyBlob.data(), keyBlob.size());
@@ -413,9 +412,4 @@
return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
}
-ScopedAStatus RemoteKeyMintDevice::performOperation(
- const vector<uint8_t>& /* request */, vector<uint8_t>* /* response */) {
- return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
-}
-
} // namespace aidl::android::hardware::security::keymint
diff --git a/guest/hals/keymint/remote/remote_keymint_device.h b/guest/hals/keymint/remote/remote_keymint_device.h
index 7f289b4..c4fdc63 100644
--- a/guest/hals/keymint/remote/remote_keymint_device.h
+++ b/guest/hals/keymint/remote/remote_keymint_device.h
@@ -65,7 +65,7 @@
ScopedAStatus begin(KeyPurpose purpose, const vector<uint8_t>& keyBlob,
const vector<KeyParameter>& params,
- const HardwareAuthToken& authToken,
+ const optional<HardwareAuthToken>& authToken,
BeginResult* result) override;
ScopedAStatus deviceLocked(
@@ -77,9 +77,6 @@
const std::vector<uint8_t>& storageKeyBlob,
std::vector<uint8_t>* ephemeralKeyBlob) override;
- ScopedAStatus performOperation(const vector<uint8_t>& request,
- vector<uint8_t>* response) override;
-
protected:
::keymaster::RemoteKeymaster& impl_;
SecurityLevel securityLevel_;
