Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / a701c458ca6d36604f417f55e95c63493d1545d7
commita701c458ca6d36604f417f55e95c63493d1545d7[log] [tgz]
authorEric Biggers <ebiggers@google.com>Tue Oct 23 13:06:55 2018 -0700
committerEric Biggers <ebiggers@google.com>Thu Oct 25 17:12:32 2018 -0700
tree5ba25fccd5eeb6a0b467142e4623d88a4072f952
parent0016efbc446910650cc041194621cc8f9ba04151 [diff]
vold: rename from "ext4 encryption" to fscrypt

We support file-based encryption on both ext4 and f2fs now, and the
kernel API is the same.  So rename things appropriately in vold:

    e4crypt => fscrypt
    ext4enc => fscrypt
    Ext4Crypt => FsCrypt
    EXT4_* => FS_*
    ext4_encryption_key => fscrypt_key

Additionally, the common functions shared by 'vold' and 'init' are now
in libfscrypt rather than ext4_utils.  So update vold to link to
libfscrypt and include the renamed headers.

Note: there's a chance of 'fscrypt' being confused with the dm-crypt
based encryption code in vold which is called 'cryptfs'.  However,
fscrypt is the name used in the kernel for ext4/f2fs/ubifs encryption,
and it's preferable to use the same name in userspace.

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