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

model/Disk.cpp

diff --git a/model/Disk.cpp b/model/Disk.cpp
index bfaf2cd..f92435d 100644
--- a/model/Disk.cpp
+++ b/model/Disk.cpp
@@ -16,6 +16,7 @@
 
 #include "Disk.h"
 #include "FsCrypt.h"
+#include "KeyUtil.h"
 #include "PrivateVolume.h"
 #include "PublicVolume.h"
 #include "Utils.h"
@@ -505,11 +506,12 @@
         return -EIO;
     }
 
-    std::string keyRaw;
-    if (ReadRandomBytes(cryptfs_get_keysize(), keyRaw) != OK) {
+    KeyBuffer key;
+    if (!generateStorageKey(cryptfs_get_keygen(), &key)) {
         LOG(ERROR) << "Failed to generate key";
         return -EIO;
     }
+    std::string keyRaw(key.begin(), key.end());
 
     std::string partGuid;
     StrToHex(partGuidRaw, partGuid);