commit 4209eb413828ad4817c32b28655882bd72eb8641
author Eric Biggers <ebiggers@google.com> Mon Oct 29 10:36:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 29 10:36:57 2018 -0700
tree 5dd2abe8b4b139cc049661b27fa00d8abf594c2b
parent a51283d2816f2d537c13bf77655b9eed0c3bf7a4
parent e6680f17a8f4dc2295f11b5a5ce2cf3951128533

Merge changes from topic "e4crypt_to_fscrypt" am: ddbd8325f5
am: e6680f17a8

Change-Id: Ie093f99065ac99b31ab92910b5618473057c07e2

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 252edeb..a17b8b2 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -16,6 +16,7 @@
 
 #include "KeyUtil.h"
 
+#include <linux/fs.h>
 #include <iomanip>
 #include <sstream>
 #include <string>
@@ -32,16 +33,7 @@
 namespace android {
 namespace vold {
 
-// fscrypt:TODO get these definitions from <linux/fs.h>
-constexpr int FS_KEY_DESCRIPTOR_SIZE = 8;
-constexpr int FS_ENCRYPTION_MODE_AES_256_XTS = 1;
 constexpr int FS_AES_256_XTS_KEY_SIZE = 64;
-constexpr int FS_MAX_KEY_SIZE = 64;
-struct fscrypt_key {
-    uint32_t mode;
-    char raw[FS_MAX_KEY_SIZE];
-    uint32_t size;
-};
 
 bool randomKey(KeyBuffer* key) {
     *key = KeyBuffer(FS_AES_256_XTS_KEY_SIZE);
@@ -54,7 +46,7 @@
 }
 
 // Get raw keyref - used to make keyname and to pass to ioctl
-static std::string generateKeyRef(const char* key, int length) {
+static std::string generateKeyRef(const uint8_t* key, int length) {
     SHA512_CTX c;
 
     SHA512_Init(&c);