diff options
| author | Paul Crowley <paulcrowley@google.com> | 2015-07-13 22:34:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 22:34:54 +0000 |
| commit | 7b5b1667674453ae04474f853245a6a671066bd2 (patch) | |
| tree | c62194a28a6bb8d895ffae1d5d14c9f67360a569 | |
| parent | 3b10d6195ad6d147d32306f734a64e50a51bbccd (diff) | |
| parent | d3548a38a524f6f5ccddd87f806054fbb71da434 (diff) | |
| download | extras-7b5b1667674453ae04474f853245a6a671066bd2.tar.gz | |
am d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
* commit 'd3548a38a524f6f5ccddd87f806054fbb71da434':
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
| -rw-r--r-- | ext4_utils/ext4_crypt_init_extensions.cpp | 10 | ||||
| -rw-r--r-- | ext4_utils/ext4_crypt_init_extensions.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp index e1b69e1e..5e167a54 100644 --- a/ext4_utils/ext4_crypt_init_extensions.cpp +++ b/ext4_utils/ext4_crypt_init_extensions.cpp @@ -164,3 +164,13 @@ int e4crypt_set_directory_policy(const char* dir) return 0; } + +int e4crypt_set_user_crypto_policies(const char* dir) +{ + auto command = std::string() + "cryptfs setusercryptopolicies " + dir; + auto result = vold_command(command); + // ext4enc:TODO proper error handling + KLOG_INFO(TAG, "setusercryptopolicies returned with result %s\n", + result.c_str()); + return 0; +} diff --git a/ext4_utils/ext4_crypt_init_extensions.h b/ext4_utils/ext4_crypt_init_extensions.h index 79311246..d02d181d 100644 --- a/ext4_utils/ext4_crypt_init_extensions.h +++ b/ext4_utils/ext4_crypt_init_extensions.h @@ -11,5 +11,6 @@ int e4crypt_create_device_key(const char* path, int e4crypt_set_directory_policy(const char* path); bool e4crypt_non_default_key(const char* path); int do_policy_set(const char *directory, const char *policy, int policy_length); +int e4crypt_set_user_crypto_policies(const char* path); __END_DECLS |