Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "VTS: Test specifying --expect_upgrade {yes,no}" am: 434a0cc160 am: 9715eb7117

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

Change-Id: If21c85236031192f665d920ea865248f356489af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-15 10:31:38 +00:00
committed by Automerger Merge Worker
parent 19ded5fc02 9715eb7117
commit 239b468f30
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
security/keymint/aidl/vts/functional/KeyBlobUpgradeTest.cpp
View File

@@ -36,11 +36,14 @@
//
// adb push keymint-blobs /data/local/tmp/keymint-blobs
//
// 5) Run the "*After*" subset of these tests with the `--keyblob_dir <dir>` command-line argument
// pointing to the directory with the keyblobs:
// 5) Run the "*After*" subset of these tests, with the following command-line arguments
// `--keyblob_dir <dir>`: pointing to the directory with the keyblobs.
// `--expect_upgrade {yes|no}` (Optional): To specify if users expect an upgrade on the keyBlobs,
// will be "yes" by default.
//
// VtsAidlKeyMintTargetTest --gtest_filter="*KeyBlobUpgradeTest*After*" \
// --keyblob_dir /data/local/tmp/keymint-blobs
// --keyblob_dir /data/local/tmp/keymint-blobs \
// --expect_upgrade {yes|no}
//
// (Note that this skips the `CreateKeyBlobs` test, which would otherwise replace the saved
// keyblobs with freshly generated ones.).
@@ -408,12 +411,18 @@ TEST_P(KeyBlobUpgradeTest, UpgradeKeyBlobsBefore) {
//
// VtsAidlKeyMintTargetTest --gtest_filter="*KeyBlobUpgradeTest.UpgradeKeyBlobsAfter*" \
// --keyblob_dir /data/local/tmp/keymint-blobs
// --expect_upgrade {yes|no}
//
// - this replaces the keyblob contents in that directory; if needed, save the upgraded keyblobs
// with:
// adb pull /data/local/tmp/keymint-blobs/
TEST_P(KeyBlobUpgradeTest, UpgradeKeyBlobsAfter) {
UpgradeKeyBlobs(/* expectUpgrade= */ true);
bool expectUpgrade = true; // this test expects upgrade to happen by default
if (expect_upgrade.has_value() && expect_upgrade == false) {
std::cout << "Not expecting key upgrade due to --expect_upgrade no\n";
expectUpgrade = false;
}
UpgradeKeyBlobs(expectUpgrade);
}
// To run this test:

1
security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
View File

@@ -174,6 +174,7 @@ string x509NameToStr(X509_NAME* name) {
bool KeyMintAidlTestBase::arm_deleteAllKeys = false;
bool KeyMintAidlTestBase::dump_Attestations = false;
std::string KeyMintAidlTestBase::keyblob_dir;
std::optional<bool> KeyMintAidlTestBase::expect_upgrade = std::nullopt;
uint32_t KeyMintAidlTestBase::boot_patch_level(
const vector<KeyCharacteristics>& key_characteristics) {

2
security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
View File

@@ -70,6 +70,8 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> {
// Directory to store/retrieve keyblobs, using subdirectories named for the
// KeyMint instance in question (e.g. "./default/", "./strongbox/").
static std::string keyblob_dir;
// To specify if users expect an upgrade on the keyBlobs.
static std::optional<bool> expect_upgrade;
void SetUp() override;
void TearDown() override {

13
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View File

@@ -8718,6 +8718,19 @@ int main(int argc, char** argv) {
std::string(argv[i + 1]);
++i;
}
if (std::string(argv[i]) == "--expect_upgrade") {
if (i + 1 >= argc) {
std::cerr << "Missing argument for --expect_upgrade\n";
return 1;
}
std::string arg = argv[i + 1];
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::
expect_upgrade =
arg == "yes"
? true
: (arg == "no" ? false : std::optional<bool>(std::nullopt));
++i;
}
}
}
return RUN_ALL_TESTS();