commit f123d6e078d7dbe8b0919969f5e5778e5987ecb0
author Daniil Lunev <dlunev@chromium.org> Mon Oct 12 15:02:58 2020 +1100
committer Commit Bot <commit-bot@chromium.org> Thu Oct 22 08:16:29 2020 +0000
tree 5fbe050d944566923fd6183c374efcea098cbc3d
parent 0f2c7d2445b68aa732a12d9610c4eba628d050b5

cryptohome: populate keyset index on load

Since now all the keyset loading goes through a single path, enforce
keyset_index population on the path. That will later allow us to get rid
of almost all cases of passing raw index to the functions.

BUG=chromium:1124561
TEST=unittest

Change-Id: Ib7bc747eb71f2d648031bd607ac59e87ae197080
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2465547
Tested-by: Daniil Lunev <dlunev@chromium.org>
Commit-Queue: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: Leo Lai <cylai@google.com>

cryptohome/homedirs.cc

diff --git a/cryptohome/homedirs.cc b/cryptohome/homedirs.cc
index cf84fbe..038096b 100644
--- a/cryptohome/homedirs.cc
+++ b/cryptohome/homedirs.cc
@@ -301,7 +301,6 @@
       continue;
     }
     if (GetSerializedKeysetLabel(vk->serialized(), index) == key_label) {
-      vk->set_legacy_index(index);
       return vk.release();
     }
   }
@@ -971,6 +970,7 @@
     LOG(ERROR) << "Failed to load keyset file for user " << obfuscated_user;
     return false;
   }
+  keyset->set_legacy_index(index);
   return true;
 }
 

cryptohome/homedirs_unittest.cc

diff --git a/cryptohome/homedirs_unittest.cc b/cryptohome/homedirs_unittest.cc
index 5d47439..c092493 100644
--- a/cryptohome/homedirs_unittest.cc
+++ b/cryptohome/homedirs_unittest.cc
@@ -733,6 +733,8 @@
       // which isn't used in a test.
       EXPECT_CALL(*active_vks_[i], Load(keyset_paths_[0]))
           .WillRepeatedly(Return(true));
+      EXPECT_CALL(*active_vks_[i], set_legacy_index(_))
+          .Times(testing::AnyNumber());
     }
     active_vk_ = active_vks_[0];