summaryrefslogtreecommitdiff
path: root/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2021-05-18 11:43:31 +0100
committerDavid Drysdale <drysdale@google.com>2021-05-19 16:40:25 +0100
commitdb0dcf5034cedf82d4f9cd9b452c9d0290b4d4f5 (patch)
treed304f98fa80b1da4d0f1a1269c992648e0a51af4 /security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
parentcad540327059a9617016442af3d2ca2fe75352cd (diff)
KeyMint: improve HAL spec and tests
- clarify & test BIGNUM spec - allow alternative return codes when requesting device unique attestation - use specific error for early boot import failure - test more early boot key scenarios (in post-early-boot mode) Test: VtsAidlKeyMintTargetTest Change-Id: I70a342084a29144aef1ed0ff80fec02cc06ffbc0
Diffstat (limited to 'security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp')
-rw-r--r--security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
index 6f0ee4e74d..b0f056a68c 100644
--- a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -75,7 +75,7 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) {
.Authorization(TAG_DEVICE_UNIQUE_ATTESTATION),
&key_blob, &key_characteristics);
- ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT);
+ ASSERT_TRUE(result == ErrorCode::INVALID_ARGUMENT || result == ErrorCode::UNSUPPORTED_TAG);
}
/*
@@ -101,7 +101,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) {
.Authorization(TAG_DEVICE_UNIQUE_ATTESTATION),
&key_blob, &key_characteristics);
- ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT);
+ ASSERT_TRUE(result == ErrorCode::INVALID_ARGUMENT || result == ErrorCode::UNSUPPORTED_TAG);
}
/*