tag 8560aaa5a4e6313da34de62100ca0d0fc655606f
tagger The Android Open Source Project <initial-contribution@android.com> Mon Feb 03 16:21:59 2020 -0800
object a093bf43e5237e56704dc244f28deaa7d416991f

Android 9.0.0 Release 53 (6107734)

commit a093bf43e5237e56704dc244f28deaa7d416991f
author Shawn Willden <swillden@google.com> Wed Oct 02 08:58:22 2019 -0600
committer Huizi Yang <yanghuiz@google.com> Wed Oct 09 16:05:13 2019 -0700
tree 3b6d85a5c6b5925001ae83a898277f3507e1f9b2
parent 0137c899f3d273681a77a8cade47963d1867ff2b

Encrypt AES-256 keystore master keys.

ag/5984229 that added support for AES-256 master keys inadvertently
caused them not to be encyrpted by the user's password.  This is less
damaging to security than it might appear because these keys are also
encrypted by Keymaster, in the TEE or StrongBox.

Bug: 141955555
Test:  Manually verify password is encryption on a userdebug build.
Change-Id: Ic5e82546df67346e4c348273cf4fe2bac382c9dc
Merged-In: Ie44a4097e058bd5b9e45aa73115c266b9570a4fc
(cherry picked from commit 58e675567c446b77c6ec83d8e07fecbd829f60ae)