| commit | 4cbe215e34678970403da6c11320222304a2aebb | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Mar 07 14:44:38 2023 +0000 |
| committer | David Drysdale <drysdale@google.com> | Tue Mar 07 14:47:11 2023 +0000 |
| tree | 704fc0a4bdfa64a604b08f511af257a5c735c00a | |
| parent | 3eed07ead0a89192f81ff9a0ceae79c00fc61b5f [diff] |
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
diff --git a/security/keymint/aidl/vts/functional/AuthTest.cpp b/security/keymint/aidl/vts/functional/AuthTest.cpp index a31ac01..78c88f4 100644 --- a/security/keymint/aidl/vts/functional/AuthTest.cpp +++ b/security/keymint/aidl/vts/functional/AuthTest.cpp
@@ -274,7 +274,7 @@ std::shared_ptr<ISecureClock> clock_; string password_; uint32_t uid_; - long sid_; + int64_t sid_; std::vector<uint8_t> handle_; };
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h index a6a9df6..3c753d1 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
@@ -356,7 +356,7 @@ SecurityLevel securityLevel_; string name_; string author_; - long challenge_; + int64_t challenge_; private: void CheckEncryptOneByteAtATime(BlockMode block_mode, const int block_size,