Merge "Added a new test case to validate AES algorithm with invalid key sizes." am: aef2a7562e

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

Change-Id: I63bcfe3b06f7c00a426c6c30365062ce9ebdc39e
This commit is contained in:
Shawn Willden
2021-05-05 20:05:00 +00:00
committed by Automerger Merge Worker

View File

@@ -921,6 +921,23 @@ TEST_P(NewKeyGenerationTest, HmacDigestNone) {
.Authorization(TAG_MIN_MAC_LENGTH, 128)));
}
/**
* NewKeyGenerationTest.AesInvalidKeySize
*
* Verifies that specifying an invalid key size for AES key generation returns
* UNSUPPORTED_KEY_SIZE.
*/
TEST_P(NewKeyGenerationTest, AesInvalidKeySize) {
for (auto key_size : InvalidKeySizes(Algorithm::AES)) {
ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,
GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED)
.AesEncryptionKey(key_size)
.Authorization(TAG_BLOCK_MODE, BlockMode::ECB)
.Padding(PaddingMode::NONE)));
}
}
INSTANTIATE_KEYMASTER_HIDL_TEST(NewKeyGenerationTest);
typedef KeymasterHidlTest SigningOperationsTest;