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

Merge "Add performOperation stub." am: 4411dc963c am: 421806ad79

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596937

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8ad7217a5fe962bd9b971fde106eabc089c2429
This commit is contained in:
Shawn Willden
2021-03-03 22:38:37 +00:00
committed by Automerger Merge Worker
parent 5e8b252609 421806ad79
commit 0fbf87918d
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl
View File

@@ -45,5 +45,6 @@ interface IKeyMintDevice {
android.hardware.security.keymint.BeginResult begin(in android.hardware.security.keymint.KeyPurpose purpose, in byte[] keyBlob, in android.hardware.security.keymint.KeyParameter[] params, in android.hardware.security.keymint.HardwareAuthToken authToken);
void deviceLocked(in boolean passwordOnly, in @nullable android.hardware.security.secureclock.TimeStampToken timestampToken);
void earlyBootEnded();
byte[] performOperation(in byte[] request);
const int AUTH_TOKEN_MAC_LENGTH = 32;
}

14
security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
View File

@@ -760,4 +760,18 @@ interface IKeyMintDevice {
* an EARLY_BOOT_ONLY key after this method is called must fail with Error::INVALID_KEY_BLOB.
*/
void earlyBootEnded();
/**
* Called by the client to perform a KeyMint operation.
*
* This method is added primarily as a placeholder. Details will be fleshed before the KeyMint
* V1 interface is frozen. Until then, implementations must return ErrorCode::UNIMPLEMENTED.
*
* @param request is an encrypted buffer containing a description of the operation the client
* wishes to perform. Structure, content and encryption are TBD.
*
* @return an encrypted buffer containing the result of the operation. Structure, content and
* encryption are TBD.
*/
byte[] performOperation(in byte[] request);
}

2
security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
View File

@@ -261,7 +261,7 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> {
ErrorCode UseRsaKey(const vector<uint8_t>& rsaKeyBlob);
ErrorCode UseEcdsaKey(const vector<uint8_t>& ecdsaKeyBlob);
private:
protected:
std::shared_ptr<IKeyMintDevice> keymint_;
uint32_t os_version_;
uint32_t os_patch_level_;

16
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View File

@@ -4633,7 +4633,7 @@ TEST_P(KeyAgreementTest, Ecdh) {
INSTANTIATE_KEYMINT_AIDL_TEST(KeyAgreementTest);
typedef KeyMintAidlTestBase EarlyBootKeyTest;
using EarlyBootKeyTest = KeyMintAidlTestBase;
TEST_P(EarlyBootKeyTest, CreateEarlyBootKeys) {
auto [aesKeyData, hmacKeyData, rsaKeyData, ecdsaKeyData] =
@@ -4690,9 +4690,10 @@ TEST_P(EarlyBootKeyTest, DISABLED_FullTest) {
CheckedDeleteKey(&rsaKeyData.blob);
CheckedDeleteKey(&ecdsaKeyData.blob);
}
INSTANTIATE_KEYMINT_AIDL_TEST(EarlyBootKeyTest);
typedef KeyMintAidlTestBase UnlockedDeviceRequiredTest;
using UnlockedDeviceRequiredTest = KeyMintAidlTestBase;
// This may be a problematic test. It can't be run repeatedly without unlocking the device in
// between runs... and on most test devices there are no enrolled credentials so it can't be
@@ -4724,8 +4725,19 @@ TEST_P(UnlockedDeviceRequiredTest, DISABLED_KeysBecomeUnusable) {
CheckedDeleteKey(&rsaKeyData.blob);
CheckedDeleteKey(&ecdsaKeyData.blob);
}
INSTANTIATE_KEYMINT_AIDL_TEST(UnlockedDeviceRequiredTest);
using PerformOperationTest = KeyMintAidlTestBase;
TEST_P(PerformOperationTest, RequireUnimplemented) {
vector<uint8_t> response;
auto result = keymint_->performOperation({} /* request */, &response);
ASSERT_EQ(GetReturnErrorCode(result), ErrorCode::UNIMPLEMENTED);
}
INSTANTIATE_KEYMINT_AIDL_TEST(PerformOperationTest);
} // namespace aidl::android::hardware::security::keymint::test
int main(int argc, char** argv) {