eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-07 17:00:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly initialise gcrypt in format call.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@171 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-01-10 20:40:41 +00:00
parent 0575ded2aa
commit a97b56cc32
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup.c
View File

@@ -1134,6 +1134,12 @@ int crypt_format(struct crypt_device *cd,
if (!type)
return -EINVAL;
/* Some hash functions need initialized gcrypt library */
if (init_crypto()) {
log_err(cd, _("Cannot initialize crypto backend.\n"));
return -ENOSYS;
}
if (volume_key)
cd->volume_key = LUKS_alloc_masterkey(volume_key_size,
volume_key);

2
luks/keymanage.c
View File

@@ -391,7 +391,7 @@ static int LUKS_PBKDF2_performance_check(const char *hashSpec,
{
if (!*PBKDF2_per_sec) {
if (PBKDF2_performance_check(hashSpec, PBKDF2_per_sec) < 0) {
log_err(ctx, _("Not compatible PBKDF2 options (using hash algorithm %s)."), hashSpec);
log_err(ctx, _("Not compatible PBKDF2 options (using hash algorithm %s).\n"), hashSpec);
return -EINVAL;
}
log_dbg("PBKDF2: %" PRIu64 " iterations per second using hash %s.", *PBKDF2_per_sec, hashSpec);