From 2a73db3d9e21463359eeda97c34c3d9a99712cd1 Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Mon, 10 May 2021 10:58:58 +0100 Subject: [PATCH] KeyMint VTS: fix 3DES key sizes DES key size is 7/8 of what's provided. Test: VtsAidlKeyMintTargetTest Change-Id: I645c1df11646d129a9421630cb6e5ed86edb8899 --- security/keymint/aidl/vts/functional/KeyMintTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index cd7d603a09..bcf8b951df 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp @@ -3329,7 +3329,7 @@ TEST_P(ImportKeyTest, TripleDesSuccess) { */ TEST_P(ImportKeyTest, TripleDesFailure) { 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}) { // Explicit key size doesn't match that of the provided key. auto result = ImportKey(AuthorizationSetBuilder() @@ -3343,19 +3343,19 @@ TEST_P(ImportKeyTest, TripleDesFailure) { << "unexpected result: " << result; } // 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, ImportKey(AuthorizationSetBuilder() .Authorization(TAG_NO_AUTH_REQUIRED) - .TripleDesEncryptionKey(long_key.size() * 8) + .TripleDesEncryptionKey(long_key.size() * 7) .EcbMode() .Padding(PaddingMode::PKCS7), KeyFormat::RAW, long_key)); - string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f7358"); + string short_key = hex2str("a49d7564199e97cb529d2c9d97bf2f98d35edf57ba1f73"); ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, ImportKey(AuthorizationSetBuilder() .Authorization(TAG_NO_AUTH_REQUIRED) - .TripleDesEncryptionKey(short_key.size() * 8) + .TripleDesEncryptionKey(short_key.size() * 7) .EcbMode() .Padding(PaddingMode::PKCS7), KeyFormat::RAW, short_key));