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

Show better errors if kesylot decryption fails.

Browse Source 
This happens also in cipher check where the old message was
very confusing.
This commit is contained in:
Milan Broz
2018-10-11 15:41:35 +02:00
parent f01d044618
commit 1d7749a40f
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/luks1/keyencryption.c
View File

@@ -24,6 +24,7 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h>
#include "luks.h" #include "luks.h"
#include "af.h" #include "af.h"
#include "internal.h" #include "internal.h"
@@ -212,6 +213,7 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength,
{ {
struct device *device = crypt_metadata_device(ctx); struct device *device = crypt_metadata_device(ctx);
struct crypt_storage *s; struct crypt_storage *s;
struct stat st;
int devfd = -1, r = 0; int devfd = -1, r = 0;
/* Only whole sector reads supported */ /* Only whole sector reads supported */
@@ -237,17 +239,26 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength,
log_dbg("Using userspace crypto wrapper to access keyslot area."); log_dbg("Using userspace crypto wrapper to access keyslot area.");
r = -EIO;
/* Read buffer from device */ /* Read buffer from device */
devfd = device_open(device, O_RDONLY); devfd = device_open(device, O_RDONLY);
if (devfd < 0) if (devfd < 0) {
goto bad; log_err(ctx, _("Cannot open device %s."), device_path(device));
crypt_storage_destroy(s);
return -EIO;
}
if (read_lseek_blockwise(devfd, device_block_size(device), if (read_lseek_blockwise(devfd, device_block_size(device),
device_alignment(device), dst, dstLength, device_alignment(device), dst, dstLength,
sector * SECTOR_SIZE) < 0) sector * SECTOR_SIZE) < 0) {
goto bad; if (!fstat(devfd, &st) && (st.st_size < dstLength))
log_err(ctx, _("Device %s is too small."), device_path(device));
else
log_err(ctx, _("IO error while decrypting keyslot."));
close(devfd);
crypt_storage_destroy(s);
return -EIO;
}
close(devfd); close(devfd);
@@ -255,13 +266,5 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength,
r = crypt_storage_decrypt(s, 0, dstLength / SECTOR_SIZE, dst); r = crypt_storage_decrypt(s, 0, dstLength / SECTOR_SIZE, dst);
crypt_storage_destroy(s); crypt_storage_destroy(s);
return r;
bad:
if (devfd >= 0)
close(devfd);
log_err(ctx, _("IO error while decrypting keyslot."));
crypt_storage_destroy(s);
return r; return r;
} }