tree bc2a830603fa5eac10b4442df27ecaa7f01e9b85
parent 0d466c94a81eec5a701748ff7526a2e3515b3c97
author Shawn Willden <swillden@google.com> 1570028302 -0600
committer android-build-team Robot <android-build-team-robot@google.com> 1570761341 +0000

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
(cherry picked from commit b951bc53174bc583e7b76c40982aa82da8b01854)