diff options
Diffstat (limited to 'fs/ecryptfs/crypto.c')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index b98b786b0e9d..cf0186fd9bfe 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -470,8 +470,6 @@ out: static void init_ecryption_parameters(bool *hw_crypt, bool *cipher_supported, struct ecryptfs_crypt_stat *crypt_stat) { - unsigned char final[2*ECRYPTFS_MAX_CIPHER_NAME_SIZE+1]; - if (!hw_crypt || !cipher_supported) return; @@ -480,9 +478,7 @@ static void init_ecryption_parameters(bool *hw_crypt, bool *cipher_supported, if (get_events() && get_events()->is_cipher_supported_cb) { *cipher_supported = - get_events()->is_cipher_supported_cb( - ecryptfs_get_full_cipher(crypt_stat->cipher, - crypt_stat->cipher_mode, final, sizeof(final))); + get_events()->is_cipher_supported_cb(crypt_stat); if (*cipher_supported) { /** @@ -809,12 +805,8 @@ static void ecryptfs_generate_new_key(struct ecryptfs_crypt_stat *crypt_stat) static int ecryptfs_generate_new_salt(struct ecryptfs_crypt_stat *crypt_stat) { size_t salt_size = 0; - unsigned char final[2*ECRYPTFS_MAX_CIPHER_NAME_SIZE+1]; - salt_size = ecryptfs_get_salt_size_for_cipher( - ecryptfs_get_full_cipher(crypt_stat->cipher, - crypt_stat->cipher_mode, - final, sizeof(final))); + salt_size = ecryptfs_get_salt_size_for_cipher(crypt_stat); if (0 == salt_size) return 0; |