PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtar: Fix restore of e4crypt policies

Browse Source 
Change-Id: I457356069330c38299fd326181c1c88b12a08dbd
This commit is contained in:
Ethan Yonker
2017-07-05 22:10:24 -05:00
parent c86b6d4312
commit da056fdc5b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtar/block.c
+5 -3
View File
@@ -347,11 +347,13 @@ th_read(TAR *t)
{
start += E4CRYPT_TAG_LEN;
char *end = strchr(start, '\n');
if(!end)
end = strchr(start, '\0');
if(end)
{
t->th_buf.e4crypt_policy = strndup(start, end-start);
t->th_buf.e4crypt_policy = strndup(start, end-start);
#ifdef DEBUG
printf(" th_read(): E4Crypt policy detected: %s\n", t->th_buf.e4crypt_policy);
printf(" th_read(): E4Crypt policy detected: %s\n", t->th_buf.e4crypt_policy);
#endif
}
}
@@ -563,7 +565,7 @@ th_write(TAR *t)
#endif
/* setup size - EXT header has format "*size of this whole tag as ascii numbers* *space* *content* *newline* */
// size newline
sz = E4CRYPT_TAG_LEN + EXT4_KEY_DESCRIPTOR_HEX + 3 + 1;
sz = E4CRYPT_TAG_LEN + strlen(t->th_buf.e4crypt_policy) + 3 + 1;
if(sz >= 100) // another ascci digit for size
++sz;