Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc6fcab4 authored by Max Bires's avatar Max Bires Committed by Automerger Merge Worker
Browse files

Merge "Increase challenge size in tests." am: dcaa8038 am: a24527be am:... 

Merge "Increase challenge size in tests." am: dcaa8038 am: a24527be am: 14bae2b1 am: d354a980

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



Change-Id: Ie27e796a8d97b4837f3f5e31eb9c6820e7eedcb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e8fb8d4 d354a980

security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl

+2 −1
Original line number Diff line number Diff line
@@ -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

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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_);