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

Merge "Key{Mint,Master} VTS: fix incremental AES tags"

Browse Source
This commit is contained in:
David Drysdale
2022-03-14 15:45:28 +00:00
committed by Gerrit Code Review
parent 3192a09b11 1a637199e4
commit e5c2bf01fc
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keymaster/4.0/vts/functional/KeymasterHidlTest.cpp
View File

@@ -445,12 +445,15 @@ string KeymasterHidlTest::MacMessage(const string& message, Digest digest, size_
void KeymasterHidlTest::CheckAesIncrementalEncryptOperation(BlockMode block_mode, void KeymasterHidlTest::CheckAesIncrementalEncryptOperation(BlockMode block_mode,
int message_size) { int message_size) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() auto builder = AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)
.AesEncryptionKey(128) .AesEncryptionKey(128)
.BlockMode(block_mode) .BlockMode(block_mode)
.Padding(PaddingMode::NONE) .Padding(PaddingMode::NONE);
.Authorization(TAG_MIN_MAC_LENGTH, 128))); if (block_mode == BlockMode::GCM) {
builder.Authorization(TAG_MIN_MAC_LENGTH, 128);
}
ASSERT_EQ(ErrorCode::OK, GenerateKey(builder));
for (int increment = 1; increment <= message_size; ++increment) { for (int increment = 1; increment <= message_size; ++increment) {
string message(message_size, 'a'); string message(message_size, 'a');

15
security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
View File

@@ -667,12 +667,15 @@ string KeyMintAidlTestBase::MacMessage(const string& message, Digest digest, siz
void KeyMintAidlTestBase::CheckAesIncrementalEncryptOperation(BlockMode block_mode, void KeyMintAidlTestBase::CheckAesIncrementalEncryptOperation(BlockMode block_mode,
int message_size) { int message_size) {
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() auto builder = AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)
.AesEncryptionKey(128) .AesEncryptionKey(128)
.BlockMode(block_mode) .BlockMode(block_mode)
.Padding(PaddingMode::NONE) .Padding(PaddingMode::NONE);
.Authorization(TAG_MIN_MAC_LENGTH, 128))); if (block_mode == BlockMode::GCM) {
builder.Authorization(TAG_MIN_MAC_LENGTH, 128);
}
ASSERT_EQ(ErrorCode::OK, GenerateKey(builder));
for (int increment = 1; increment <= message_size; ++increment) { for (int increment = 1; increment <= message_size; ++increment) {
string message(message_size, 'a'); string message(message_size, 'a');