commit 4eac2647277f1edf6dc69a050a51cb49f526b69e
author Paul Crowley <paulcrowley@google.com> Wed Feb 12 11:04:05 2020 -0800
committer Paul Crowley <paulcrowley@google.com> Fri Feb 14 13:59:06 2020 -0800
tree f3973a179d7cf718a2fe1f7434b421a9dfdf50e6
parent 7566e467ab2d604970edca9de318f3cf5642b044

Refactor key generation to handle both normal and metadata encryption.

Bug: 147733587
Test: Treehugger
Change-Id: Iee176037dec2621c84da325c2627f988fcebbc8d
Merged-In: Iee176037dec2621c84da325c2627f988fcebbc8d

cryptfs.h

diff --git a/cryptfs.h b/cryptfs.h
index b34a8d9..872806e 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -26,6 +26,7 @@
 #include <cutils/properties.h>
 
 #include "KeyBuffer.h"
+#include "KeyUtil.h"
 
 #define CRYPT_FOOTER_OFFSET 0x4000
 
@@ -73,7 +74,6 @@
 const char* cryptfs_get_password(void);
 void cryptfs_clear_password(void);
 int cryptfs_isConvertibleToFBE(void);
-
-size_t cryptfs_get_keysize();
+const android::vold::KeyGeneration cryptfs_get_keygen();
 
 #endif /* ANDROID_VOLD_CRYPTFS_H */