commit 1bf93470ed164c324228c9fbdb2559a6940dcc8a
author Shawn Willden <swillden@google.com> Mon Oct 07 15:22:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 07 15:22:34 2019 -0700
tree 0243ef67f904bedec75afb7f0d6d5dded3f38922
parent 48a4d0f64a0882959a0a7965131b5ccfd32e153e
parent b951bc53174bc583e7b76c40982aa82da8b01854

Encrypt AES-256 keystore master keys.
am: b951bc5317

Change-Id: I57600ce91f6fc7004c9d344ad5976d0952b19d69

keystore/blob.cpp

diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index eac8f11..497f304 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -228,7 +228,7 @@
     mBlob->version = CURRENT_BLOB_VERSION;
     mBlob->type = uint8_t(type);
 
-    if (type == TYPE_MASTER_KEY) {
+    if (type == TYPE_MASTER_KEY || type == TYPE_MASTER_KEY_AES256) {
         mBlob->flags = KEYSTORE_FLAG_ENCRYPTED;
     } else {
         mBlob->flags = KEYSTORE_FLAG_NONE;