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

Print proper error message if LUKS2 slot encryption fail.

Browse Source
This commit is contained in:
Milan Broz
2019-06-26 17:30:30 +02:00
parent 9b5e3797b1
commit 2e841622f8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/luks2/luks2_keyslot_luks2.c
View File

@@ -50,15 +50,16 @@ static int luks2_encrypt_to_storage(char *src, size_t srcLength,
/* Encrypt buffer */ /* Encrypt buffer */
r = crypt_storage_init(&s, SECTOR_SIZE, cipher, cipher_mode, vk->key, vk->keylength); r = crypt_storage_init(&s, SECTOR_SIZE, cipher, cipher_mode, vk->key, vk->keylength);
if (r) { if (r) {
log_dbg(cd, "Userspace crypto wrapper cannot use %s-%s (%d).", log_err(cd, _("Cannot use %s-%s cipher for keyslot encryption."), cipher, cipher_mode);
cipher, cipher_mode, r);
return r; return r;
} }
r = crypt_storage_encrypt(s, 0, srcLength, src); r = crypt_storage_encrypt(s, 0, srcLength, src);
crypt_storage_destroy(s); crypt_storage_destroy(s);
if (r) if (r) {
log_err(cd, _("IO error while encrypting keyslot."));
return r; return r;
}
devfd = device_open_locked(cd, device, O_RDWR); devfd = device_open_locked(cd, device, O_RDWR);
if (devfd >= 0) { if (devfd >= 0) {
@@ -104,8 +105,7 @@ static int luks2_decrypt_from_storage(char *dst, size_t dstLength,
r = crypt_storage_init(&s, SECTOR_SIZE, cipher, cipher_mode, vk->key, vk->keylength); r = crypt_storage_init(&s, SECTOR_SIZE, cipher, cipher_mode, vk->key, vk->keylength);
if (r) { if (r) {
log_dbg(cd, "Userspace crypto wrapper cannot use %s-%s (%d).", log_err(cd, _("Cannot use %s-%s cipher for keyslot encryption."), cipher, cipher_mode);
cipher, cipher_mode, r);
return r; return r;
} }