From 6008f37ae9ab48a8527fd1762780529e4c18fa1b Mon Sep 17 00:00:00 2001 From: Wenhao Wang Date: Mon, 23 Dec 2019 11:25:03 -0800 Subject: [PATCH] Add TAG_MAC_LENGTH to EncryptionOperationsTest.AesWrongPurpose Without the setting of TAG_MAC_LENGTH, the test fails due to MISSING_MAC_PURPOSE. Bug: 145626599 Test: VtsHalKeymasterV4_0TargetTest Change-Id: Ic58411b86e07dfeeb78211abf9271ee995beabc9 --- .../4.0/vts/functional/keymaster_hidl_hal_test.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index f78eb43b52..95e9b139a5 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp @@ -2645,8 +2645,10 @@ TEST_P(EncryptionOperationsTest, AesWrongPurpose) { .Padding(PaddingMode::NONE)); ASSERT_EQ(ErrorCode::OK, err) << "Got " << err; - err = Begin(KeyPurpose::DECRYPT, - AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE)); + err = Begin(KeyPurpose::DECRYPT, AuthorizationSetBuilder() + .BlockMode(BlockMode::GCM) + .Padding(PaddingMode::NONE) + .Authorization(TAG_MAC_LENGTH, 128)); EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err; CheckedDeleteKey(); @@ -2659,8 +2661,10 @@ TEST_P(EncryptionOperationsTest, AesWrongPurpose) { .Authorization(TAG_MIN_MAC_LENGTH, 128) .Padding(PaddingMode::NONE))); - err = Begin(KeyPurpose::ENCRYPT, - AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE)); + err = Begin(KeyPurpose::ENCRYPT, AuthorizationSetBuilder() + .BlockMode(BlockMode::GCM) + .Padding(PaddingMode::NONE) + .Authorization(TAG_MAC_LENGTH, 128)); EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err; }