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

Commit 836e79fb authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d am:... 

Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d am: cd2af34d am: 590665c1

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

Change-Id: I21eff3e3f3af55b2041b739dc7e0d8342df25599
parents c39d8bff 590665c1

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

+7 −3
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests { 


    void generateTestEekChain(size_t eekLength) {

        auto chain = generateEekChain(rpcHardwareInfo.supportedEekCurve, eekLength, eekId_);

        EXPECT_TRUE(chain) << chain.message();

        ASSERT_TRUE(chain) << chain.message();

        if (chain) testEekChain_ = chain.moveValue();

        testEekLength_ = eekLength;

    }
@@ -669,7 +669,9 @@ TEST_P(CertificateRequestTest, DISABLED_NonEmptyRequest_prodMode) { 
TEST_P(CertificateRequestTest, NonEmptyRequestCorruptMac_testMode) {

    bool testMode = true;

    generateKeys(testMode, 1 /* numKeys */);

    MacedPublicKey keyWithCorruptMac = corrupt_maced_key(keysToSign_[0]).moveValue();

    auto result = corrupt_maced_key(keysToSign_[0]);

    ASSERT_TRUE(result) << result.moveMessage();

    MacedPublicKey keyWithCorruptMac = result.moveValue();



    bytevec keysToSignMac;

    DeviceInfo deviceInfo;
@@ -688,7 +690,9 @@ TEST_P(CertificateRequestTest, NonEmptyRequestCorruptMac_testMode) { 
TEST_P(CertificateRequestTest, NonEmptyRequestCorruptMac_prodMode) {

    bool testMode = false;

    generateKeys(testMode, 1 /* numKeys */);

    MacedPublicKey keyWithCorruptMac = corrupt_maced_key(keysToSign_[0]).moveValue();

    auto result = corrupt_maced_key(keysToSign_[0]);

    ASSERT_TRUE(result) << result.moveMessage();

    MacedPublicKey keyWithCorruptMac = result.moveValue();



    bytevec keysToSignMac;

    DeviceInfo deviceInfo;

security/keymint/support/remote_prov_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ ErrMsgOr<EekChain> generateEekChain(int32_t supportedEekCurve, size_t length, 
    bytevec prev_priv_key;

    for (size_t i = 0; i < length - 1; ++i) {

        auto keyPair = generateKeyPair(supportedEekCurve, false);

        if (!keyPair) keyPair.moveMessage();

        if (!keyPair) return keyPair.moveMessage();

        auto [pub_key, priv_key] = keyPair.moveValue();



        // The first signing key is self-signed.
@@ -242,7 +242,7 @@ ErrMsgOr<EekChain> generateEekChain(int32_t supportedEekCurve, size_t length, 
        prev_priv_key = priv_key;

    }

    auto keyPair = generateKeyPair(supportedEekCurve, true);

    if (!keyPair) keyPair.moveMessage();

    if (!keyPair) return keyPair.moveMessage();

    auto [pub_key, priv_key] = keyPair.moveValue();



    auto coseKey = constructCoseKey(supportedEekCurve, eekId, pub_key);