commit 1e6061c13982b2d5594f1fa701157824117485c8
author Mohd Faraz <androiabledroid@gmail.com> Sat Jan 07 21:26:56 2023 +0100
committer bigbiff <bigbiff@teamw.in> Sun Jan 29 20:46:00 2023 +0000
tree a89d56541f4bbb842773a21345a58421846c88e2
parent 1524764106c215e6c8ea27d86b61ef92a877d2f7

libtar: dynamically choose fscrypt policy [1/2]

Change-Id: I0e08365cc1500bc67bc8cf9cc07bafc607333d49
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
(cherry picked from commit 97b849918cf578eec5419de6a8061f11164527af)

libtar/output.c

diff --git a/libtar/output.c b/libtar/output.c
index 8611b41..3f57c83 100755
--- a/libtar/output.c
+++ b/libtar/output.c
@@ -60,15 +60,9 @@
 	       (t->th_buf.gnu_longname ? t->th_buf.gnu_longname : "[NULL]"));
 	LOG("  gnu_longlink = \"%s\"\n",
 	       (t->th_buf.gnu_longlink ? t->th_buf.gnu_longlink : "[NULL]"));
-		   
 #ifdef USE_FSCRYPT
-#ifdef USE_FSCRYPT_POLICY_V1
 	LOG("  fep = \"%s\"\n",
-	       (t->th_buf.fep ? t->th_buf.fep->master_key_descriptor : (uint8_t*) "[NULL]"));
-#else
-	LOG("  fep = \"%s\"\n",
-	       (t->th_buf.fep ? t->th_buf.fep->master_key_identifier : (uint8_t*) "[NULL]"));
-#endif
+		(t->th_buf.fep ? get_policy_descriptor(t->th_buf.fep) : (uint8_t*) "[NULL]"));
 #endif
 }