summaryrefslogtreecommitdiffstats
path: root/fs_mgr/include
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-10-09 14:22:49 +0000
committerPaul Lawrence <paullawrence@google.com>2014-10-09 09:05:36 -0700
commitbbb36319119edde9377fb80015235893c30d2bc9 (patch)
tree1de353d5bd49e6b548c068664d2f549407227deb /fs_mgr/include
parenta49bfc0d2620a9ad95ddfa7ec61ce06a77066d97 (diff)
downloadsystem_core-bbb36319119edde9377fb80015235893c30d2bc9.zip
system_core-bbb36319119edde9377fb80015235893c30d2bc9.tar.gz
system_core-bbb36319119edde9377fb80015235893c30d2bc9.tar.bz2
Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
Diffstat (limited to 'fs_mgr/include')
-rw-r--r--fs_mgr/include/fs_mgr.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index 0c7eb20..5e2ff41 100644
--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -20,6 +20,13 @@
#include <stdint.h>
#include <linux/dm-ioctl.h>
+// Magic number at start of verity metadata
+#define VERITY_METADATA_MAGIC_NUMBER 0xb001b001
+
+// Replacement magic number at start of verity metadata to cleanly
+// turn verity off in userdebug builds.
+#define VERITY_METADATA_MAGIC_DISABLE 0x46464f56 // "VOFF"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -74,6 +81,7 @@ int fs_mgr_add_entry(struct fstab *fstab,
struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const char *path);
int fs_mgr_is_voldmanaged(struct fstab_rec *fstab);
int fs_mgr_is_nonremovable(struct fstab_rec *fstab);
+int fs_mgr_is_verified(struct fstab_rec *fstab);
int fs_mgr_is_encryptable(struct fstab_rec *fstab);
int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab);
int fs_mgr_swapon_all(struct fstab *fstab);