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

Merge "Skip curve25519 upgrade tests on KeyMint v1" am: 44671d923a am: bcb554a4f5

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

Change-Id: I700f50193f6bca7faf90069387f8259e1f34937f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale
2023-02-01 14:21:20 +00:00
committed by Automerger Merge Worker
parent ce39fecafc bcb554a4f5
commit f0a3cd191a
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,18 +76,14 @@ std::vector<std::string> keyblob_names_tee = {
"rsa-key", "p256-key", "ed25519-key", "x25519-key",
"rsa-attest-key", "p256-attest-key", "ed25519-attest-key"};
std::vector<std::string> keyblob_names_tee_no_25519 = {
"aes-key", "aes-key-rr", "des-key", "hmac-key",
"rsa-key", "p256-key", "rsa-attest-key", "p256-attest-key"};
std::vector<std::string> keyblob_names_sb = {"aes-key", "aes-key-rr", "des-key",
"hmac-key", "rsa-key", "p256-key",
"rsa-attest-key", "p256-attest-key"};
const std::vector<std::string>& keyblob_names(SecurityLevel sec_level) {
if (sec_level == SecurityLevel::STRONGBOX) {
return keyblob_names_sb;
} else {
return keyblob_names_tee;
}
}
bool requires_rr(const std::string& name) {
return name.find("-rr") != std::string::npos;
}
@@ -194,13 +190,23 @@ std::vector<uint8_t> load_cert(const std::string& subdir, const std::string& nam
class KeyBlobUpgradeTest : public KeyMintAidlTestBase {
protected:
const std::vector<std::string>& keyblob_names() {
if (SecLevel() == SecurityLevel::STRONGBOX) {
return keyblob_names_sb;
} else if (!Curve25519Supported()) {
return keyblob_names_tee_no_25519;
} else {
return keyblob_names_tee;
}
}
void UpgradeKeyBlobs(bool expectUpgrade) {
std::string subdir = keyblob_subdir(keyblob_dir, GetParam(), /* create? */ false);
if (subdir.empty()) {
GTEST_SKIP() << "No keyblob directory provided";
}
for (std::string name : keyblob_names(SecLevel())) {
for (std::string name : keyblob_names()) {
for (bool with_hidden : {false, true}) {
std::string app_id;
std::string app_data;
@@ -348,7 +354,7 @@ TEST_P(KeyBlobUpgradeTest, CreateKeyBlobsBefore) {
.SetDefaultValidity(),
}};
for (std::string name : keyblob_names(SecLevel())) {
for (std::string name : keyblob_names()) {
auto entry = keys_info.find(name);
ASSERT_NE(entry, keys_info.end()) << "no builder for " << name;
auto builder = entry->second;
@@ -425,7 +431,7 @@ TEST_P(KeyBlobUpgradeTest, UseKeyBlobsBeforeOrAfter) {
"/data/local/tmp/keymint-blobs";
}
for (std::string name : keyblob_names(SecLevel())) {
for (std::string name : keyblob_names()) {
for (bool with_hidden : {false, true}) {
auto builder = AuthorizationSetBuilder();
if (with_hidden) {
@@ -562,7 +568,7 @@ TEST_P(KeyBlobUpgradeTest, DeleteRRKeyBlobsAfter) {
"/data/local/tmp/keymint-blobs";
}
for (std::string name : keyblob_names(SecLevel())) {
for (std::string name : keyblob_names()) {
for (bool with_hidden : {false, true}) {
auto builder = AuthorizationSetBuilder();
if (with_hidden) {