| commit | 5196f93ae1c4aa5f797bc5646f33f246f7cc0c63 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Mar 09 07:49:24 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 09 07:49:24 2023 +0000 |
| tree | b9d45b9f9ade0ed96736575563cbbb0da55cf062 | |
| parent | fbeda1e4bf5d6e924645b8fe072eab5709c1390d [diff] | |
| parent | 4cbe215e34678970403da6c11320222304a2aebb [diff] |
Merge "Allow for 32-bit VTS builds"
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,