commit 4ee10592a1c9000bb6014d0855b69eaffd97c968
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 16 11:20:27 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Mar 16 11:20:27 2020 -0700
tree 91bb34dc680622eacfc03ebe26445f81d64c8982
parent a4f8e44695fc7528e74d6f3eefd793f3df727424
parent 360af8d591abe36005b3e97c0a3ea1dfe2b6dfe2

Merge 360af8d591abe36005b3e97c0a3ea1dfe2b6dfe2 on remote branch

Change-Id: Iafd112f01fabd9eee31f388c35ab5cdc795e29f4

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index a69056b..51bdf85 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -2812,7 +2812,12 @@
 			info->charger_screen_enabled = 0;
 #if VERIFIED_BOOT || VERIFIED_BOOT_2
 			if (VB_M <= target_get_vb_version())
+			{
 				info->verity_mode = 1; //enforcing by default
+				info->user_public_key_length = 0;
+				memset(info->rollback_index, 0, sizeof(info->rollback_index));
+				memset(info->user_public_key, 0, sizeof(info->user_public_key));
+			}
 #endif
 			write_device_info(info);
 		}