OSDN Git Service

DO NOT MERGE Securely encrypt the master key
authorPaul Lawrence <paullawrence@google.com>
Tue, 28 Apr 2015 22:13:04 +0000 (22:13 +0000)
committerPaul Lawrence <paullawrence@google.com>
Fri, 29 May 2015 17:35:33 +0000 (17:35 +0000)
commitbc2eb8c3fd621605ff1ccaed04a71e6685acc974
tree27790f124027f2b279669d4681f04037b3ee052c
parent14d9b4f16be91459e1ab8421fd8f2ec273d05cf3
DO NOT MERGE Securely encrypt the master key

(cherry-picked from commit 377cd1957172c19ee21baa3d6bda0840f1ce020d)

Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.

Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/148586/
  https://android-review.googlesource.com/#/c/148604/
  https://android-review.googlesource.com/#/c/148606/
  https://android-review.googlesource.com/#/c/148607/

Bug: 18151196

Change-Id: I7a4ef3f3a937c45ff18f17c9ad1398293a8630f3
ext4_utils/Android.mk
ext4_utils/e4crypt_static.c [deleted file]
ext4_utils/ext4_crypt.cpp
ext4_utils/ext4_crypt_init_extensions.cpp
ext4_utils/ext4_crypt_init_extensions.h [new file with mode: 0644]
ext4_utils/key_control.cpp [new file with mode: 0644]
ext4_utils/key_control.h [moved from ext4_utils/ext4_crypt.h with 50% similarity]
ext4_utils/unencrypted_properties.cpp
ext4_utils/unencrypted_properties.h