DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I0a9cd456d715f38f313f9ab55b8583c08ffb387a
diff --git a/METADATA b/METADATA
index a9d6066..2f19f50 100644
--- a/METADATA
+++ b/METADATA
@@ -1,19 +1,15 @@
name: "fsverity-utils"
-description:
- "This is `fsverity`, a userspace utility for fs-verity. fs-verity is "
- "a Linux kernel feature that does transparent on-demand "
- "integrity/authenticity verification of the contents of read-only "
- "files, using a Merkle tree (hash tree) hidden after the end of the "
- "file. The mechanism is similar to dm-verity, but implemented at the "
- "file level rather than at the block device level. The `fsverity` "
- "utility allows you to set up fs-verity protected files."
-
+description: "This is `fsverity`, a userspace utility for fs-verity. fs-verity is a Linux kernel feature that does transparent on-demand integrity/authenticity verification of the contents of read-only files, using a Merkle tree (hash tree) hidden after the end of the file. The mechanism is similar to dm-verity, but implemented at the file level rather than at the block device level. The `fsverity` utility allows you to set up fs-verity protected files."
third_party {
url {
type: GIT
value: "https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git"
}
- version: "bdebc45b4527d64109723ad5753fa514bac47c9f"
- last_upgrade_date { year: 2018 month: 10 day: 4 }
+ version: "23a20ab7e8371cc29015d7d5787daa73f2ddd374"
license_type: RESTRICTED
+ last_upgrade_date {
+ year: 2019
+ month: 2
+ day: 11
+ }
}
diff --git a/crc32c_table.h b/crc32c_table.h
index 4c3dafb..822c0a6 100644
--- a/crc32c_table.h
+++ b/crc32c_table.h
@@ -4,7 +4,9 @@
* This file was automatically generated by scripts/gen_crc32c_table.c
*/
-static const u32 crc32c_table[] = {
+#include <stdint.h>
+
+static const uint32_t crc32c_table[] = {
0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4,
0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb,
0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b,
diff --git a/scripts/gen_crc32c_table.c b/scripts/gen_crc32c_table.c
index 1c5af88..656a349 100644
--- a/scripts/gen_crc32c_table.c
+++ b/scripts/gen_crc32c_table.c
@@ -47,7 +47,9 @@
printf(" * This file was automatically generated by scripts/gen_crc32c_table.c\n");
printf(" */\n");
printf("\n");
- printf("static const u32 crc32c_table[] = {\n");
+ printf("#include <stdint.h>\n");
+ printf("\n");
+ printf("static const uint32_t crc32c_table[] = {\n");
for (i = 0; i < 64; i++) {
printf("\t");
for (j = 0; j < 4; j++) {
