diff options
| author | David Drysdale <drysdale@google.com> | 2022-05-09 05:15:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-09 05:15:34 +0000 |
| commit | 955b77be576ebe34b97e37dbe940d967a07aa3b3 (patch) | |
| tree | ef71c70db441e7f5ae25cf4d5e1fbfa54941a778 /security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | |
| parent | dc48405431b431d01a0d8aa8db3f363feb54e9fe (diff) | |
| parent | 32a7bece10eb1f47cb4473a86df12cabd7910d46 (diff) | |
Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 943c692c3e..be219940f8 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp @@ -17,6 +17,7 @@ #include "KeyMintAidlTestBase.h" #include <chrono> +#include <fstream> #include <unordered_set> #include <vector> @@ -1460,6 +1461,11 @@ void verify_subject(const X509* cert, // OPENSSL_free(cert_issuer); } +bool is_gsi_image() { + std::ifstream ifs("/system/system_ext/etc/init/init.gsi.rc"); + return ifs.good(); +} + vector<uint8_t> build_serial_blob(const uint64_t serial_int) { BIGNUM_Ptr serial(BN_new()); EXPECT_TRUE(BN_set_u64(serial.get(), serial_int)); |