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 "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3 am: 9f4239423d

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

Change-Id: I158c42c5e92a864e91a1594b4a07884b991d63f4
This commit is contained in:
Treehugger Robot
2021-05-14 22:31:29 +00:00
committed by Automerger Merge Worker
parent 0ba331884c 9f4239423d
commit ff02c3fc10
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View File

@@ -3329,7 +3329,7 @@ TEST_P(ImportKeyTest, TripleDesSuccess) {
*/ */
TEST_P(ImportKeyTest, TripleDesFailure) { TEST_P(ImportKeyTest, TripleDesFailure) {
string key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358"); string key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358");
uint32_t bitlen = key.size() * 8; uint32_t bitlen = key.size() * 7;
for (uint32_t key_size : {bitlen - 1, bitlen + 1, bitlen - 8, bitlen + 8}) { for (uint32_t key_size : {bitlen - 1, bitlen + 1, bitlen - 8, bitlen + 8}) {
// Explicit key size doesn't match that of the provided key. // Explicit key size doesn't match that of the provided key.
auto result = ImportKey(AuthorizationSetBuilder() auto result = ImportKey(AuthorizationSetBuilder()
@@ -3343,19 +3343,19 @@ TEST_P(ImportKeyTest, TripleDesFailure) {
<< "unexpected result: " << result; << "unexpected result: " << result;
} }
// Explicit key size matches that of the provided key, but it's not a valid size. // Explicit key size matches that of the provided key, but it's not a valid size.
string long_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358"); string long_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f735800");
ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,
ImportKey(AuthorizationSetBuilder() ImportKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)
.TripleDesEncryptionKey(long_key.size() * 8) .TripleDesEncryptionKey(long_key.size() * 7)
.EcbMode() .EcbMode()
.Padding(PaddingMode::PKCS7), .Padding(PaddingMode::PKCS7),
KeyFormat::RAW, long_key)); KeyFormat::RAW, long_key));
string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358"); string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f73");
ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,
ImportKey(AuthorizationSetBuilder() ImportKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)
.TripleDesEncryptionKey(short_key.size() * 8) .TripleDesEncryptionKey(short_key.size() * 7)
.EcbMode() .EcbMode()
.Padding(PaddingMode::PKCS7), .Padding(PaddingMode::PKCS7),
KeyFormat::RAW, short_key)); KeyFormat::RAW, short_key));