diff options
| author | Nick Kralevich <nnk@google.com> | 2014-10-08 23:55:05 +0000 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-10-08 23:55:05 +0000 |
| commit | 152d2d4234ba89e0c20c4af13e291b6049a7bc33 (patch) | |
| tree | 8d745843e930acd5412af7c7466b35205126edb5 /fs_mgr/include | |
| parent | d4cea0bc16d1ad96cc6d6177232d7b339785460c (diff) | |
| download | system_core-152d2d4234ba89e0c20c4af13e291b6049a7bc33.zip system_core-152d2d4234ba89e0c20c4af13e291b6049a7bc33.tar.gz system_core-152d2d4234ba89e0c20c4af13e291b6049a7bc33.tar.bz2 | |
Revert "Enable verity on userdebug, and add disable-verity to adb"
Build is broken.
system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity':
system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (!RSA_verify(key,
^
system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here
char *verity_table_signature;
^
cc1: all warnings being treated as errors
make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1
make: *** Waiting for unfinished jobs....
This reverts commit d4cea0bc16d1ad96cc6d6177232d7b339785460c.
Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
Diffstat (limited to 'fs_mgr/include')
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 5e2ff41..0c7eb20 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -20,13 +20,6 @@ #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 @@ -81,7 +74,6 @@ 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); |