Commit 2a0aafb1 authored by Daniil Lunev's avatar Daniil Lunev Committed by Chromium LUCI CQ

cryptohome: remove AUTHORIZED_UPDATE privilege

Unused since UpdateKeyEx deprecation.

Bug: chromium:1150430, b:172344610
Test: CQ
Change-Id: I138fc01c6aaa2436c9044f7d8759a8a979a73209
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2569027
Commit-Queue: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833439}
parent 8170859f
...@@ -23,7 +23,6 @@ enum AuthKeyPrivileges { ...@@ -23,7 +23,6 @@ enum AuthKeyPrivileges {
PRIV_ADD = 1 << 1, // Can add new keys. PRIV_ADD = 1 << 1, // Can add new keys.
PRIV_REMOVE = 1 << 2, // Can remove other keys. PRIV_REMOVE = 1 << 2, // Can remove other keys.
PRIV_MIGRATE = 1 << 3, // Destroy all keys and replace with new. PRIV_MIGRATE = 1 << 3, // Destroy all keys and replace with new.
PRIV_AUTHORIZED_UPDATE = 1 << 4, // Key can be updated in place.
PRIV_DEFAULT = PRIV_ADD | PRIV_REMOVE | PRIV_MIGRATE PRIV_DEFAULT = PRIV_ADD | PRIV_REMOVE | PRIV_MIGRATE
}; };
......
...@@ -65,8 +65,6 @@ void KeyDefPrivilegesToKeyPrivileges(int key_def_privileges, ...@@ -65,8 +65,6 @@ void KeyDefPrivilegesToKeyPrivileges(int key_def_privileges,
privileges->set_add(key_def_privileges & PRIV_ADD); privileges->set_add(key_def_privileges & PRIV_ADD);
privileges->set_remove(key_def_privileges & PRIV_REMOVE); privileges->set_remove(key_def_privileges & PRIV_REMOVE);
privileges->set_update(key_def_privileges & PRIV_MIGRATE); privileges->set_update(key_def_privileges & PRIV_MIGRATE);
privileges->set_authorized_update(key_def_privileges &
PRIV_AUTHORIZED_UPDATE);
} }
// TODO(crbug.com/797848): Add tests that cover this logic. // TODO(crbug.com/797848): Add tests that cover this logic.
...@@ -149,8 +147,6 @@ std::vector<KeyDefinition> GetKeyDataReplyToKeyDefinitions( ...@@ -149,8 +147,6 @@ std::vector<KeyDefinition> GetKeyDataReplyToKeyDefinitions(
key_definition.privileges |= PRIV_REMOVE; key_definition.privileges |= PRIV_REMOVE;
if (privileges.update()) if (privileges.update())
key_definition.privileges |= PRIV_MIGRATE; key_definition.privileges |= PRIV_MIGRATE;
if (privileges.authorized_update())
key_definition.privileges |= PRIV_AUTHORIZED_UPDATE;
// Extract |policy|. // Extract |policy|.
key_definition.policy.low_entropy_credential = key_definition.policy.low_entropy_credential =
......
...@@ -264,7 +264,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyDefaultPrivileges) { ...@@ -264,7 +264,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyDefaultPrivileges) {
EXPECT_TRUE(privileges.add()); EXPECT_TRUE(privileges.add());
EXPECT_TRUE(privileges.remove()); EXPECT_TRUE(privileges.remove());
EXPECT_TRUE(privileges.update()); EXPECT_TRUE(privileges.update());
EXPECT_FALSE(privileges.authorized_update());
} }
TEST(CryptohomeUtilTest, KeyDefinitionToKeyAddPrivileges) { TEST(CryptohomeUtilTest, KeyDefinitionToKeyAddPrivileges) {
...@@ -278,7 +277,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyAddPrivileges) { ...@@ -278,7 +277,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyAddPrivileges) {
EXPECT_TRUE(privileges.add()); EXPECT_TRUE(privileges.add());
EXPECT_FALSE(privileges.remove()); EXPECT_FALSE(privileges.remove());
EXPECT_FALSE(privileges.update()); EXPECT_FALSE(privileges.update());
EXPECT_FALSE(privileges.authorized_update());
} }
TEST(CryptohomeUtilTest, KeyDefinitionToKeyRemovePrivileges) { TEST(CryptohomeUtilTest, KeyDefinitionToKeyRemovePrivileges) {
...@@ -292,7 +290,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyRemovePrivileges) { ...@@ -292,7 +290,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyRemovePrivileges) {
EXPECT_FALSE(privileges.add()); EXPECT_FALSE(privileges.add());
EXPECT_TRUE(privileges.remove()); EXPECT_TRUE(privileges.remove());
EXPECT_FALSE(privileges.update()); EXPECT_FALSE(privileges.update());
EXPECT_FALSE(privileges.authorized_update());
} }
TEST(CryptohomeUtilTest, KeyDefinitionToKeyUpdatePrivileges) { TEST(CryptohomeUtilTest, KeyDefinitionToKeyUpdatePrivileges) {
...@@ -306,26 +303,11 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyUpdatePrivileges) { ...@@ -306,26 +303,11 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyUpdatePrivileges) {
EXPECT_FALSE(privileges.add()); EXPECT_FALSE(privileges.add());
EXPECT_FALSE(privileges.remove()); EXPECT_FALSE(privileges.remove());
EXPECT_TRUE(privileges.update()); EXPECT_TRUE(privileges.update());
EXPECT_FALSE(privileges.authorized_update());
}
TEST(CryptohomeUtilTest, KeyDefinitionToKeyAuthorizedUpdatePrivileges) {
KeyDefinition key_def;
key_def.privileges = PRIV_AUTHORIZED_UPDATE;
Key key;
KeyDefinitionToKey(key_def, &key);
KeyPrivileges privileges = key.data().privileges();
EXPECT_FALSE(privileges.add());
EXPECT_FALSE(privileges.remove());
EXPECT_FALSE(privileges.update());
EXPECT_TRUE(privileges.authorized_update());
} }
TEST(CryptohomeUtilTest, KeyDefinitionToKeyAllPrivileges) { TEST(CryptohomeUtilTest, KeyDefinitionToKeyAllPrivileges) {
KeyDefinition key_def; KeyDefinition key_def;
key_def.privileges = PRIV_DEFAULT | PRIV_AUTHORIZED_UPDATE; key_def.privileges = PRIV_DEFAULT;
Key key; Key key;
KeyDefinitionToKey(key_def, &key); KeyDefinitionToKey(key_def, &key);
...@@ -334,7 +316,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyAllPrivileges) { ...@@ -334,7 +316,6 @@ TEST(CryptohomeUtilTest, KeyDefinitionToKeyAllPrivileges) {
EXPECT_TRUE(privileges.add()); EXPECT_TRUE(privileges.add());
EXPECT_TRUE(privileges.remove()); EXPECT_TRUE(privileges.remove());
EXPECT_TRUE(privileges.update()); EXPECT_TRUE(privileges.update());
EXPECT_TRUE(privileges.authorized_update());
} }
// Test the KeyDefinitionToKey() function against the KeyDefinition struct of // Test the KeyDefinitionToKey() function against the KeyDefinition struct of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment