diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2006-10-31 01:07:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 11:07:01 -0500 |
commit | 8bba066f4e3854755a303cee37ea37bd080a46b3 (patch) | |
tree | 3f8cf2df5da6459b0218b97b3799ceb896d4ba8a /fs/ecryptfs/main.c | |
parent | 565d9724b8ce49b530287de34aa17f45f21624d5 (diff) |
[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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index a65f4865182c..a78d87d14baf 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) | |||
315 | "with key size [%Zd] bytes; rc = [%d]\n", | 315 | "with key size [%Zd] bytes; rc = [%d]\n", |
316 | mount_crypt_stat->global_default_cipher_name, | 316 | mount_crypt_stat->global_default_cipher_name, |
317 | mount_crypt_stat->global_default_cipher_key_size, rc); | 317 | mount_crypt_stat->global_default_cipher_key_size, rc); |
318 | mount_crypt_stat->global_key_tfm = NULL; | ||
319 | mount_crypt_stat->global_auth_tok_key = NULL; | ||
318 | rc = -EINVAL; | 320 | rc = -EINVAL; |
319 | goto out; | 321 | goto out; |
320 | } | 322 | } |