Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da056fdc authored by Ethan Yonker's avatar Ethan Yonker
Browse files

libtar: Fix restore of e4crypt policies 

Change-Id: I457356069330c38299fd326181c1c88b12a08dbd
parent c86b6d43

libtar/block.c

+5 −3
Original line number Diff line number Diff line
@@ -347,6 +347,8 @@ 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);
@@ -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;