aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2006-10-30 22:07:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 08:07:01 -0800
commit8bba066f4e3854755a303cee37ea37bd080a46b3 (patch)
tree3f8cf2df5da6459b0218b97b3799ceb896d4ba8a /fs/ecryptfs/main.c
parent565d9724b8ce49b530287de34aa17f45f21624d5 (diff)
downloadkernel_samsung_aries-8bba066f4e3854755a303cee37ea37bd080a46b3.zip
kernel_samsung_aries-8bba066f4e3854755a303cee37ea37bd080a46b3.tar.gz
kernel_samsung_aries-8bba066f4e3854755a303cee37ea37bd080a46b3.tar.bz2
[PATCH] eCryptfs: Cipher code to new crypto API
Update cipher block encryption code to the new crypto API. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r--fs/ecryptfs/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index a65f486..a78d87d 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -315,6 +315,8 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options)
"with key size [%Zd] bytes; rc = [%d]\n",
mount_crypt_stat->global_default_cipher_name,
mount_crypt_stat->global_default_cipher_key_size, rc);
+ mount_crypt_stat->global_key_tfm = NULL;
+ mount_crypt_stat->global_auth_tok_key = NULL;
rc = -EINVAL;
goto out;
}