diff options
| author | Shawn Willden <swillden@google.com> | 2019-10-04 18:32:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-04 18:32:18 -0700 |
| commit | a4c76c5541736cb96453ae4b26bac4a31aeee8c0 (patch) | |
| tree | cf6d4304cb5b7facf7084d419536044ae476dc74 | |
| parent | 92b51cd8dcbc5afa56c8b90af805c792f4c4fd69 (diff) | |
| parent | 921d3a3678408af3598ef6bd8ec8f8afd4f6ee2e (diff) | |
| download | security-a4c76c5541736cb96453ae4b26bac4a31aeee8c0.tar.gz | |
Encrypt AES-256 keystore master keys.
am: 921d3a3678
Change-Id: I0cf7053bd1391eb02c1cac144ff1aa506e3dfc74
| -rw-r--r-- | keystore/blob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/blob.cpp b/keystore/blob.cpp index 86262816..ffdb454b 100644 --- a/keystore/blob.cpp +++ b/keystore/blob.cpp @@ -219,7 +219,7 @@ Blob::Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_ 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; |