fscrypt: integrate v1 processing into TWRP
Change-Id: I3bf9c14b818f9c3e0570c44c82bf0769fcec907f
diff --git a/libtar/block.c b/libtar/block.c
index db97222..b46d55a 100755
--- a/libtar/block.c
+++ b/libtar/block.c
@@ -384,8 +384,12 @@
(int)t->th_buf.fep->contents_encryption_mode,
(int)t->th_buf.fep->filenames_encryption_mode,
(int)t->th_buf.fep->flags,
+#ifdef USE_FSCRYPT_POLICY_V1
+ t->th_buf.fep->master_key_descriptor);
+#else
t->th_buf.fep->master_key_identifier);
#endif
+#endif
}
else {
printf(" invalid fscrypt header found\n");
@@ -594,9 +598,14 @@
if((t->options & TAR_STORE_FSCRYPT_POL) && t->th_buf.fep != NULL)
{
#ifdef DEBUG
+#ifdef USE_FSCRYPT_POLICY_V1
+ printf("th_write(): using fscrypt_policy %s\n",
+ t->th_buf.fep->master_key_descriptor);
+#else
printf("th_write(): using fscrypt_policy %s\n",
t->th_buf.fep->master_key_identifier);
#endif
+#endif
/* setup size - EXT header has format "*size of this whole tag as ascii numbers* *space* *version code* *content* *newline* */
// size newline
#ifdef USE_FSCRYPT_POLICY_V1