eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2026-01-06 07:25:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Print error if hash is not supported.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@485 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-03-25 16:10:56 +00:00
parent bdc3fdcd0d
commit 6371786093
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/loopaes/loopaes.c
View File

@@ -67,7 +67,8 @@ static int hash_key(const char *src, size_t src_len,
return r;
}
static int hash_keys(struct volume_key **vk,
static int hash_keys(struct crypt_device *cd,
struct volume_key **vk,
const char **input_keys,
unsigned int keys_count,
unsigned int key_len_output)
@@ -80,8 +81,11 @@ static int hash_keys(struct volume_key **vk,
tweak = get_tweak(keys_count);
key_len_input = strlen(input_keys[0]);
if (!keys_count || !key_len_output || !hash_name || !key_len_input)
if (!keys_count || !key_len_output || !hash_name || !key_len_input) {
log_err(cd, _("Key processing error (using hash %s).\n"),
hash_name ?: "[none]");
return -EINVAL;
}
*vk = crypt_alloc_volume_key(key_len_output * keys_count, NULL);
if (!*vk)
@@ -170,7 +174,7 @@ int LOOPAES_parse_keyfile(struct crypt_device *cd,
}
*keys_count = key_index;
return hash_keys(vk, keys, key_index, crypt_get_volume_key_size(cd));
return hash_keys(cd, vk, keys, key_index, crypt_get_volume_key_size(cd));
}
int LOOPAES_activate(struct crypt_device *cd,