Fix some gcc warnings on 32bit systems.

This commit is contained in:
Milan Broz
2019-08-30 09:41:04 +02:00
parent 593f5ee569
commit 4d6269a42d
4 changed files with 7 additions and 7 deletions

View File

@@ -979,8 +979,8 @@ static int set_pbkdf_params(struct crypt_device *cd, const char *dev_type)
pbkdf.hash = opt_hash ?: pbkdf_default->hash;
pbkdf.time_ms = (uint32_t)opt_iteration_time ?: pbkdf_default->time_ms;
if (strcmp(pbkdf.type, CRYPT_KDF_PBKDF2)) {
pbkdf.max_memory_kb = opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
pbkdf.parallel_threads = opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
pbkdf.max_memory_kb = (uint32_t)opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
pbkdf.parallel_threads = (uint32_t)opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
}
if (opt_pbkdf_iterations) {