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

Use crypt_safe_memcpy for operations with key.

Browse Source
This commit is contained in:
Milan Broz
2024-04-24 21:42:10 +02:00
parent 4322ddbcb3
commit 40e5c7d095
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tcrypt/tcrypt.c
View File

@@ -320,16 +320,16 @@ static void TCRYPT_copy_key(struct tcrypt_alg *alg, const char *mode,
int ks2;
if (!strncmp(mode, "xts", 3)) {
ks2 = alg->key_size / 2;
memcpy(out_key, &key[alg->key_offset], ks2);
memcpy(&out_key[ks2], &key[alg->iv_offset], ks2);
crypt_safe_memcpy(out_key, &key[alg->key_offset], ks2);
crypt_safe_memcpy(&out_key[ks2], &key[alg->iv_offset], ks2);
} else if (!strncmp(mode, "lrw", 3)) {
ks2 = alg->key_size - TCRYPT_LRW_IKEY_LEN;
memcpy(out_key, &key[alg->key_offset], ks2);
memcpy(&out_key[ks2], key, TCRYPT_LRW_IKEY_LEN);
crypt_safe_memcpy(out_key, &key[alg->key_offset], ks2);
crypt_safe_memcpy(&out_key[ks2], key, TCRYPT_LRW_IKEY_LEN);
} else if (!strncmp(mode, "cbc", 3)) {
memcpy(out_key, &key[alg->key_offset], alg->key_size);
crypt_safe_memcpy(out_key, &key[alg->key_offset], alg->key_size);
/* IV + whitening */
memcpy(&out_key[alg->key_size], &key[alg->iv_offset],
crypt_safe_memcpy(&out_key[alg->key_size], &key[alg->iv_offset],
alg->key_extra_size);
}
}