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

Commit 4cbe215e authored by David Drysdale's avatar David Drysdale
Browse files

Allow for 32-bit VTS builds 

In 32-bit builds a `long` may be 32 bits, but the `long` values on an
AIDL interface are 64 bits.  Therefore need to use `int64_t` for the
corresponding C++ type, not `long`.

Bug: 271056044
Test: VtsAidlKeyMintTargetTest --gtest_filter="*AuthTest*" (32-b)
Change-Id: I19f5a1d825dfcc45087534bbd4239a13cdfec3f7
parent 3eed07ea

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

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ class AuthTest : public KeyMintAidlTestBase { 
    std::shared_ptr<ISecureClock> clock_;

    string password_;

    uint32_t uid_;

    long sid_;

    int64_t sid_;

    std::vector<uint8_t> handle_;

};

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> { 
    SecurityLevel securityLevel_;

    string name_;

    string author_;

    long challenge_;

    int64_t challenge_;



  private:

    void CheckEncryptOneByteAtATime(BlockMode block_mode, const int block_size,