Skip to content

Commit

Permalink
ext4 crypto: migrate into vfs's crypto engine
Browse files Browse the repository at this point in the history
This patch removes the most parts of internal crypto codes.
And then, it modifies and adds some ext4-specific crypt codes to use the generic
facility.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
Jaegeuk Kim authored and tytso committed Jul 10, 2016
1 parent ff0031d commit a7550b3
Show file tree
Hide file tree
Showing 19 changed files with 297 additions and 1,997 deletions.
12 changes: 2 additions & 10 deletions fs/ext4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,9 @@ config EXT4_FS_SECURITY
extended attributes for file security labels, say N.

config EXT4_ENCRYPTION
tristate "Ext4 Encryption"
bool "Ext4 Encryption"
depends on EXT4_FS
select CRYPTO_AES
select CRYPTO_CBC
select CRYPTO_ECB
select CRYPTO_XTS
select CRYPTO_CTS
select CRYPTO_CTR
select CRYPTO_SHA256
select KEYS
select ENCRYPTED_KEYS
select FS_ENCRYPTION
help
Enable encryption of ext4 files and directories. This
feature is similar to ecryptfs, but it is more memory
Expand Down
2 changes: 0 additions & 2 deletions fs/ext4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \

ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o
ext4-$(CONFIG_EXT4_FS_SECURITY) += xattr_security.o
ext4-$(CONFIG_EXT4_FS_ENCRYPTION) += crypto_policy.o crypto.o \
crypto_key.o crypto_fname.o
Loading

0 comments on commit a7550b3

Please sign in to comment.