diff options
| author | Eric Biggers <ebiggers@google.com> | 2021-06-15 11:34:00 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2021-06-15 12:07:15 -0700 |
| commit | d86a8abec7afecaf58795a6ef5a8e2f81cafdcce (patch) | |
| tree | 90c5e5f033cd8a5ce6dbb0ba4e51e6a603616b80 /cryptfs.cpp | |
| parent | e33bd41f495dbf4a0d92158390c9955ffe2de1b6 (diff) | |
| download | vold-d86a8abec7afecaf58795a6ef5a8e2f81cafdcce.tar.gz | |
Replace most references to Keymaster with Keystore
Now that vold uses Keystore2 rather than the Keymaster HAL directly, and
also the new version of Keymaster is called "KeyMint" instead, replace
most of the references to Keymaster in vold with Keystore.
(I decided not to include the "2" in most places, as it seemed
unnecessarily precise in most places, and it would be something that
might need to keep being updated. Only Keystore.{cpp,h} really need to
care about the version number.)
I didn't rename many things in cryptfs.cpp, as that file will be going
away soon anyway. I also left "wait_for_keymaster" and "vdc keymaster
earlyBootEnded" as-is for now, as those are referenced outside vold.
Bug: 183669495
Change-Id: I92cd648fae09f8c9769f7cf34dbf6c6e956be4e8
Diffstat (limited to 'cryptfs.cpp')
| -rw-r--r-- | cryptfs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cryptfs.cpp b/cryptfs.cpp index 1dbd6f66..f9d4ed4a 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -22,7 +22,7 @@ #include "CryptoType.h" #include "EncryptInplace.h" #include "FsCrypt.h" -#include "Keymaster.h" +#include "Keystore.h" #include "Process.h" #include "ScryptParameters.h" #include "Utils.h" @@ -349,7 +349,7 @@ static int keymaster_create_key_for_cryptfs_scrypt(uint32_t rsa_key_size, uint64 if (key_out_size) { *key_out_size = 0; } - Keymaster dev; + Keystore dev; if (!dev) { LOG(ERROR) << "Failed to initiate keymaster session"; return -1; @@ -395,7 +395,7 @@ static int keymaster_sign_object_for_cryptfs_scrypt(struct crypt_mnt_ftr* ftr, u return -1; } - Keymaster dev; + Keystore dev; if (!dev) { LOG(ERROR) << "Failed to initiate keymaster session"; return -1; @@ -405,7 +405,7 @@ static int keymaster_sign_object_for_cryptfs_scrypt(struct crypt_mnt_ftr* ftr, u std::string key(reinterpret_cast<const char*>(ftr->keymaster_blob), ftr->keymaster_blob_size); std::string input(reinterpret_cast<const char*>(object), object_size); std::string output; - KeymasterOperation op; + KeystoreOperation op; auto paramBuilder = km::AuthorizationSetBuilder().NoDigestOrPadding().Authorization( km::TAG_PURPOSE, km::KeyPurpose::SIGN); |