OSDN Git Service

vold: rename from "ext4 encryption" to fscrypt
authorEric Biggers <ebiggers@google.com>
Tue, 23 Oct 2018 20:06:55 +0000 (13:06 -0700)
committerEric Biggers <ebiggers@google.com>
Fri, 26 Oct 2018 00:12:32 +0000 (17:12 -0700)
commita701c458ca6d36604f417f55e95c63493d1545d7
tree5ba25fccd5eeb6a0b467142e4623d88a4072f952
parent0016efbc446910650cc041194621cc8f9ba04151
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:
Android.bp
FsCrypt.cpp [moved from Ext4Crypt.cpp with 92% similarity]
FsCrypt.h [moved from Ext4Crypt.h with 61% similarity]
KeyUtil.cpp
MetadataCrypt.cpp
MetadataCrypt.h
VoldNativeService.cpp
VolumeManager.cpp
cryptfs.cpp
fs/Ext4.cpp
fs/F2fs.cpp
model/Disk.cpp