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 "AesInvalidKeySize skip 192 on SB devices" into sc-dev am: f0394173a4

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

Change-Id: Ic062d555736fef27f8ede837e109b50ac9f86efe
This commit is contained in:
Max Bires
2021-08-20 16:30:24 +00:00
committed by Automerger Merge Worker
parent 9e52270470 f0394173a4
commit 73d8ae7d83
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
View File

@@ -940,7 +940,11 @@ TEST_P(NewKeyGenerationTest, HmacDigestNone) {
* UNSUPPORTED_KEY_SIZE. * UNSUPPORTED_KEY_SIZE.
*/ */
TEST_P(NewKeyGenerationTest, AesInvalidKeySize) { TEST_P(NewKeyGenerationTest, AesInvalidKeySize) {
int32_t firstApiLevel = property_get_int32("ro.board.first_api_level", 0);
for (auto key_size : InvalidKeySizes(Algorithm::AES)) { for (auto key_size : InvalidKeySizes(Algorithm::AES)) {
if (key_size == 192 && SecLevel() == SecurityLevel::STRONGBOX && firstApiLevel < 31) {
continue;
}
ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,
GenerateKey(AuthorizationSetBuilder() GenerateKey(AuthorizationSetBuilder()
.Authorization(TAG_NO_AUTH_REQUIRED) .Authorization(TAG_NO_AUTH_REQUIRED)

3
security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
View File

@@ -96,7 +96,8 @@ import android.hardware.security.secureclock.TimeStampToken;
* *
* o AES * o AES
* *
* - 128 and 256-bit keys * - TRUSTED_ENVIRONMENT IKeyMintDevices must support 128, 192 and 256-bit keys.
* STRONGBOX IKeyMintDevices must only support 128 and 256-bit keys.
* - CBC, CTR, ECB and GCM modes. The GCM mode must not allow the use of tags smaller than 96 * - CBC, CTR, ECB and GCM modes. The GCM mode must not allow the use of tags smaller than 96
* bits or nonce lengths other than 96 bits. * bits or nonce lengths other than 96 bits.
* - CBC and ECB modes must support unpadded and PKCS7 padding modes. With no padding CBC and * - CBC and ECB modes must support unpadded and PKCS7 padding modes. With no padding CBC and