From 89c7488370db22eaeb6bfb8f7e9ab43a72620e32 Mon Sep 17 00:00:00 2001 From: Max Bires Date: Sun, 27 Mar 2022 21:06:11 -0700 Subject: [PATCH] Increase challenge size in tests. VTS tests were currently passing a challenge size of 32 in all cases. However, the server currently sends a challenge of length 40, which may or may not change in the future. A 64 byte upper limit provides a standard size along with flexibility in case the challenge format changes in the future. Test: atest VtsHalRemotelyProvisionedComponentTargetTest Change-Id: I678bb915f139e4c23354180870a66ce33a9cfd8c --- .../aidl/android/hardware/security/keymint/ProtectedData.aidl | 3 ++- .../vts/functional/VtsRemotelyProvisionedComponentTests.cpp | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl index 50244004fb..cfbf171393 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl @@ -106,7 +106,8 @@ parcelable ProtectedData { * ] * * SignedMacAad = [ - * challenge : bstr, + * challenge : bstr .size (32..64), // Size between 32 - 64 + * // bytes inclusive * VerifiedDeviceInfo, * tag: bstr // This is the tag from COSE_Mac0 of * // KeysToCertify, to tie the key set to diff --git a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp index 3cc11f6548..7184613cfa 100644 --- a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp +++ b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp @@ -358,8 +358,7 @@ TEST_P(GenerateKeyTests, generateEcdsaP256Key_testMode) { class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests { protected: - CertificateRequestTest() : eekId_(string_to_bytevec("eekid")), challenge_(randomBytes(32)) { - } + CertificateRequestTest() : eekId_(string_to_bytevec("eekid")), challenge_(randomBytes(64)) {} void generateTestEekChain(size_t eekLength) { auto chain = generateEekChain(rpcHardwareInfo.supportedEekCurve, eekLength, eekId_);