From: Mike Halcrow Add a few codes for additional ciphers to be supported by eCryptfs, enabled by future patches in this set. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton --- fs/ecryptfs/crypto.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff -puN fs/ecryptfs/crypto.c~ecryptfs-add-codes-for-additional-ciphers fs/ecryptfs/crypto.c --- a/fs/ecryptfs/crypto.c~ecryptfs-add-codes-for-additional-ciphers +++ a/fs/ecryptfs/crypto.c @@ -1035,10 +1035,14 @@ struct ecryptfs_cipher_code_str_map_elem /* List in order of probability. */ static struct ecryptfs_cipher_code_str_map_elem ecryptfs_cipher_code_str_map[] = { - {"aes", 0x07}, + {"aes", 0x07}, /* AES-128 */ {"blowfish", 0x04}, {"des3_ede", 0x02}, - {"cast5", 0x03} + {"cast5", 0x03}, + {"twofish", 0x0a}, + {"cast6", 0x0b}, + {"aes", 0x08}, /* AES-192 */ + {"aes", 0x09} /* AES-256 */ }; /** _