resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp

Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8

diff --cc fs_mgr/fs_mgr_fstab.c
index 90c7435,9225d34..f25d10c
--- 1/fs_mgr/fs_mgr_fstab.c
--- 2/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@@ -74,7 -72,7 +74,8 @@@ static struct flag_list fs_mgr_flags[] 
      { "recoveryonly",MF_RECOVERYONLY },
      { "swapprio=",   MF_SWAPPRIO },
      { "zramsize=",   MF_ZRAMSIZE },
 +    { "max_comp_streams=",   MF_MAX_COMP_STREAMS },
+     { "verifyatboot", MF_VERIFYATBOOT },
      { "verify",      MF_VERIFY },
      { "noemulatedsd", MF_NOEMULATEDSD },
      { "notrim",       MF_NOTRIM },

diff --cc fs_mgr/fs_mgr_priv.h
index 23c97e4,120ec5a..4632521
--- 1/fs_mgr/fs_mgr_priv.h
--- 2/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@@ -85,8 -85,7 +85,9 @@@ __BEGIN_DECL
  #define MF_FORCEFDEORFBE 0x10000
  #define MF_LATEMOUNT    0x20000
  #define MF_NOFAIL       0x40000
+ #define MF_VERIFYATBOOT 0x80000
 +#define MF_MAX_COMP_STREAMS 0x100000
 +#define MF_RESERVEDSIZE 0x200000
  
  #define DM_BUF_SIZE 4096
  

diff --cc fs_mgr/fs_mgr_verity.cpp
index 031b042,a0896fa..bec5eec
--- 1/fs_mgr/fs_mgr_verity.cpp
--- 2/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@@ -31,13 -31,13 +31,14 @@@
  
  #include <android-base/file.h>
  #include <android-base/strings.h>
 +#include <crypto_utils/android_pubkey.h>
+ #include <android-base/unique_fd.h>
  #include <cutils/properties.h>
  #include <logwrap/logwrap.h>
 -
 -#include "mincrypt/rsa.h"
 -#include "mincrypt/sha.h"
 -#include "mincrypt/sha256.h"
 +#include <openssl/obj_mac.h>
 +#include <openssl/rsa.h>
 +#include <openssl/sha.h>
 +#include <private/android_filesystem_config.h>
  
  #include "fec/io.h"
  
@@@ -904,6 -950,6 +941,7 @@@ int fs_mgr_setup_verity(struct fstab_re
      alignas(dm_ioctl) char buffer[DM_BUF_SIZE];
      struct dm_ioctl *io = (struct dm_ioctl *) buffer;
      char *mount_point = basename(fstab->mount_point);
++    bool verified_at_boot = false;
  
      if (fec_open(&f, fstab->blk_device, O_RDONLY, FEC_VERITY_DISABLE,
              FEC_DEFAULT_ROOTS) < 0) {