tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1285212

Change-Id: I9299b2f0762c02dae28b4dad8a6ee67fd03ad1a1
This commit is contained in:
Treehugger Robot 2021-06-16 10:31:29 +00:00 committed by Automerger Merge Worker
commit a1c6ce6f2f
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
KeyUtil.cpp
View file

@ -36,6 +36,9 @@
namespace android {
namespace vold {
using android::fscrypt::EncryptionOptions;
using android::fscrypt::EncryptionPolicy;
const KeyGeneration neverGen() {
return KeyGeneration{0, false, false};
}

11
KeyUtil.h
View file

@ -28,8 +28,6 @@
namespace android {
namespace vold {
using namespace android::fscrypt;
// Description of how to generate a key when needed.
struct KeyGeneration {
size_t keysize;
@ -63,8 +61,8 @@ bool isFsKeyringSupported(void);
//
// Returns %true on success, %false on failure. On success also sets *policy
// to the EncryptionPolicy used to refer to this key.
bool installKey(const std::string& mountpoint, const EncryptionOptions& options,
const KeyBuffer& key, EncryptionPolicy* policy);
bool installKey(const std::string& mountpoint, const android::fscrypt::EncryptionOptions& options,
const KeyBuffer& key, android::fscrypt::EncryptionPolicy* policy);
// Evict a file-based encryption key from the kernel.
//
@ -72,7 +70,7 @@ bool installKey(const std::string& mountpoint, const EncryptionOptions& options,
//
// If the kernel doesn't support the filesystem-level keyring, the caller is
// responsible for dropping caches.
bool evictKey(const std::string& mountpoint, const EncryptionPolicy& policy);
bool evictKey(const std::string& mountpoint, const android::fscrypt::EncryptionPolicy& policy);
// Retrieves the key from the named directory, or generates it if it doesn't
// exist.
@ -82,7 +80,8 @@ bool retrieveOrGenerateKey(const std::string& key_path, const std::string& tmp_p
// Re-installs a file-based encryption key of fscrypt-provisioning type from the
// global session keyring back into fs keyring of the mountpoint.
bool reloadKeyFromSessionKeyring(const std::string& mountpoint, const EncryptionPolicy& policy);
bool reloadKeyFromSessionKeyring(const std::string& mountpoint,
const android::fscrypt::EncryptionPolicy& policy);
} // namespace vold
} // namespace android

1
MetadataCrypt.cpp
View file

@ -49,6 +49,7 @@ namespace vold {
using android::fs_mgr::FstabEntry;
using android::fs_mgr::GetEntryForMountPoint;
using android::fscrypt::GetFirstApiLevel;
using android::vold::KeyBuffer;
using namespace android::dm;