diff options
| author | mosimchah <mosimchah@gmail.com> | 2019-12-13 00:04:33 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2019-12-13 00:04:38 -0500 |
| commit | 9ea1f09c30a4e726f6cdbe1c524cd908c9f23ad7 (patch) | |
| tree | 6418a3814718af24f4ae4746179574aa4068e20f | |
| parent | 3a827b0a882258d291b67edbc5480e0ba0aedb39 (diff) | |
| parent | a093bf43e5237e56704dc244f28deaa7d416991f (diff) | |
Merge tag 'android-9.0.0_r51' of https://android.googlesource.com/platform/system/security into HEADHEADp9.0
Android 9.0.0 Release 51 (5948683)
* tag 'android-9.0.0_r51' of https://android.googlesource.com/platform/system/security:
Encrypt AES-256 keystore master keys.
Fix keystore wifi concurrency issue.
keystore: abort if verification token generation fails
Revert "Restore "Add "Unlocked device required" parameter to keys""
Revert "Add "Unlocked device required" parameter to keys"
Disable CFI for the keystore unit tests.
Change-Id: I079714aa7e711782741acbc249dd5e12bdc4dead
| -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 c3956f0..0a72d5b 100644 --- a/keystore/blob.cpp +++ b/keystore/blob.cpp @@ -170,7 +170,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; |