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

Merge "Add missing application ID tag to AES/HMAC attestation calls" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-05 17:29:21 +00:00
committed by Android (Google) Code Review
parent 65f7dbc9a9 58ce93480b
commit 585acc6778
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
View File

@@ -3932,17 +3932,21 @@ TEST_F(AttestationTest, EcAttestationRequiresAttestationAppId) {
* Verifies that attesting to AES keys fails in the expected way.
*/
TEST_F(AttestationTest, AesAttestation) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED)
.AesEncryptionKey(128)
.EcbMode()
.Padding(PaddingMode::PKCS7)));
ASSERT_EQ(ErrorCode::OK,
GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED)
.AesEncryptionKey(128)
.EcbMode()
.Padding(PaddingMode::PKCS7)));
hidl_vec<hidl_vec<uint8_t>> cert_chain;
EXPECT_EQ(ErrorCode::INCOMPATIBLE_ALGORITHM,
AttestKey(AuthorizationSetBuilder().Authorization(TAG_ATTESTATION_CHALLENGE,
HidlBuf("challenge")),
&cert_chain));
EXPECT_EQ(
ErrorCode::INCOMPATIBLE_ALGORITHM,
AttestKey(
AuthorizationSetBuilder()
.Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge"))
.Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")),
&cert_chain));
}
/*
@@ -3951,18 +3955,22 @@ TEST_F(AttestationTest, AesAttestation) {
* Verifies that attesting to HMAC keys fails in the expected way.
*/
TEST_F(AttestationTest, HmacAttestation) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED)
.HmacKey(128)
.EcbMode()
.Digest(Digest::SHA_2_256)
.Authorization(TAG_MIN_MAC_LENGTH, 128)));
ASSERT_EQ(ErrorCode::OK,
GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED)
.HmacKey(128)
.EcbMode()
.Digest(Digest::SHA_2_256)
.Authorization(TAG_MIN_MAC_LENGTH, 128)));
hidl_vec<hidl_vec<uint8_t>> cert_chain;
EXPECT_EQ(ErrorCode::INCOMPATIBLE_ALGORITHM,
AttestKey(AuthorizationSetBuilder().Authorization(TAG_ATTESTATION_CHALLENGE,
HidlBuf("challenge")),
&cert_chain));
EXPECT_EQ(
ErrorCode::INCOMPATIBLE_ALGORITHM,
AttestKey(
AuthorizationSetBuilder()
.Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge"))
.Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")),
&cert_chain));
}
typedef KeymasterHidlTest KeyDeletionTest;