lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] eCryptfs: Clean up crypto initialization

Browse Source 
Clean up the crypto initialization code; let the crypto API take care of the
key size checks.

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>
This commit is contained in:
Michael Halcrow
2006-10-30 22:07:16 -08:00
committed by Linus Torvalds
parent 4a279ff1ea
commit e5d9cbde6c
4 changed files with 24 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/ecryptfs/keystore.c
View File

@@ -493,19 +493,16 @@ static int decrypt_session_key(struct ecryptfs_auth_tok *auth_tok,
goto out;
}
}
if (password_s_ptr->session_key_encryption_key_bytes
< crypto_tfm_alg_min_keysize(tfm)) {
printk(KERN_WARNING "Session key encryption key is [%d] bytes; "
"minimum keysize for selected cipher is [%d] bytes.\n",
password_s_ptr->session_key_encryption_key_bytes,
crypto_tfm_alg_min_keysize(tfm));
rc = -EINVAL;
goto out;
}
if (tfm_mutex)
mutex_lock(tfm_mutex);
crypto_cipher_setkey(tfm, password_s_ptr->session_key_encryption_key,
crypt_stat->key_size);
rc = crypto_cipher_setkey(tfm,
password_s_ptr->session_key_encryption_key,
crypt_stat->key_size);
if (rc < 0) {
printk(KERN_ERR "Error setting key for crypto context\n");
rc = -EINVAL;
goto out_free_tfm;
}
/* TODO: virt_to_scatterlist */
encrypted_session_key = (char *)__get_free_page(GFP_KERNEL);
if (!encrypted_session_key) {