FsCrypt update: support fscrypt policies v1 and v2
This patchset introduces support decryption for Android 11.
In this update we deprecate ext4crypt. To specify the
policy version to use, use TW_USE_FSCRYPT_POLICY := 1 or
TW_USE_FSCRYPT_POLICY := 2. By default policy version will
be set to 2 if this variable is omitted.
Change-Id: I62a29c1bef36c259ec4b11259f71be613d20a112
diff --git a/crypto/fscrypt/Decrypt.h b/crypto/fscrypt/Decrypt.h
index 8fb5160..f397749 100755
--- a/crypto/fscrypt/Decrypt.h
+++ b/crypto/fscrypt/Decrypt.h
@@ -27,8 +27,8 @@
static constexpr int FLAG_STORAGE_DE = 1 << 0;
static constexpr int FLAG_STORAGE_CE = 1 << 1;
// For 9.0 Ext4CryptPie.cpp
-static constexpr int STORAGE_FLAG_DE = 1 << 0;
-static constexpr int STORAGE_FLAG_CE = 1 << 1;
+static constexpr int STORAGE_FLAG_DE = 1;
+static constexpr int STORAGE_FLAG_CE = 2;
int Get_Password_Type(const userid_t user_id, std::string& filename);