Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / f4527740309a9f89d9a32de9da40cafaa628cd88
commitf4527740309a9f89d9a32de9da40cafaa628cd88[log] [tgz]
authorShawn Willden <swillden@google.com>Thu Nov 09 15:59:39 2017 -0700
committerShawn Willden <swillden@google.com>Thu Nov 09 16:05:38 2017 -0700
tree9e8f280123de0872b7355c1b025ccbb0906ff5aa
parentb64933a5021ee9666388b781b542f11ef7665673 [diff]
Break vold dependency on keystore utilities.

This is temporary.  Keystore is in the process of being upgraded to use
the new Keymaster 4.0 HAL, and I want to leave vold alone, using
Keymaster 3.0 for the moment.  This CL just copies relevant bits of
keystore support utilities into vold, so it can stop depending on the
copies from keystore.

After the keystore update is complete, vold will be changed either to
use Keymaster 4.0 or -- more likely -- to use keystore rather than
talking to Keymaster directly.  At that point the files added by this CL
will be deleted.

Test: Device boots and successfully decrypts /data
Change-Id: I73f6d4cc4c5e20d89d7ac37d29d025bf279f9e12
8 files changed
tree: 9e8f280123de0872b7355c1b025ccbb0906ff5aa
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format
  7. Android.bp
  8. authorization_set.cpp
  9. authorization_set.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. CheckEncryption.cpp
  14. CheckEncryption.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. Devmapper.cpp
  19. Devmapper.h
  20. EncryptInplace.cpp
  21. EncryptInplace.h
  22. Ext4Crypt.cpp
  23. Ext4Crypt.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. hash.h
  27. IdleMaint.cpp
  28. IdleMaint.h
  29. KeyBuffer.cpp
  30. KeyBuffer.h
  31. Keymaster.cpp
  32. Keymaster.h
  33. keymaster_tags.h
  34. KeyStorage.cpp
  35. KeyStorage.h
  36. keystore_hidl_support.h
  37. KeyUtil.cpp
  38. KeyUtil.h
  39. Loop.cpp
  40. Loop.h
  41. main.cpp
  42. MetadataCrypt.cpp
  43. MetadataCrypt.h
  44. MoveStorage.cpp
  45. MoveStorage.h
  46. NetlinkHandler.cpp
  47. NetlinkHandler.h
  48. NetlinkManager.cpp
  49. NetlinkManager.h
  50. OWNERS
  51. PREUPLOAD.cfg
  52. Process.cpp
  53. Process.h
  54. ScryptParameters.cpp
  55. ScryptParameters.h
  56. secdiscard.cpp
  57. secontext.cpp
  58. secontext.h
  59. sehandle.h
  60. Utils.cpp
  61. Utils.h
  62. vdc.cpp
  63. vdc.rc
  64. vold.rc
  65. vold_prepare_subdirs.cpp
  66. VoldNativeService.cpp
  67. VoldNativeService.h
  68. VoldUtil.cpp
  69. VoldUtil.h
  70. VolumeManager.cpp
  71. VolumeManager.h