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

Properly fail for unsupported IVs.

Browse Source
This commit is contained in:
Milan Broz
2014-06-29 10:23:07 +02:00
parent 25cd4f3a1d
commit dfd46df8a5
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/crypto_backend/crypto_storage.c
View File

@@ -68,13 +68,13 @@ static int crypt_sector_iv_init(struct crypt_sector_iv *ctx,
ctx->type = IV_NONE; ctx->type = IV_NONE;
ctx->iv_size = 0; ctx->iv_size = 0;
return 0; return 0;
} else if (!strncasecmp(iv_name, "null", 4)) { } else if (!strcasecmp(iv_name, "null")) {
ctx->type = IV_NULL; ctx->type = IV_NULL;
} else if (!strncasecmp(iv_name, "plain64", 7)) { } else if (!strcasecmp(iv_name, "plain64")) {
ctx->type = IV_PLAIN64; ctx->type = IV_PLAIN64;
} else if (!strncasecmp(iv_name, "plain", 5)) { } else if (!strcasecmp(iv_name, "plain")) {
ctx->type = IV_PLAIN; ctx->type = IV_PLAIN;
} else if (!strncasecmp(iv_name, "essiv", 5)) { } else if (!strncasecmp(iv_name, "essiv:", 6)) {
struct crypt_hash *h = NULL; struct crypt_hash *h = NULL;
char *hash_name = strchr(iv_name, ':'); char *hash_name = strchr(iv_name, ':');
int hash_size; int hash_size;
@@ -119,7 +119,7 @@ static int crypt_sector_iv_init(struct crypt_sector_iv *ctx,
ctx->type = IV_BENBI; ctx->type = IV_BENBI;
ctx->benbi_shift = SECTOR_SHIFT - log; ctx->benbi_shift = SECTOR_SHIFT - log;
} else } else
return -EINVAL; return -ENOENT;
ctx->iv = malloc(ctx->iv_size); ctx->iv = malloc(ctx->iv_size);
if (!ctx->iv) if (!ctx->iv)

27
lib/luks1/keyencryption.c
View File

@@ -27,8 +27,13 @@
#include "internal.h" #include "internal.h"
static void _error_hint(struct crypt_device *ctx, const char *device, static void _error_hint(struct crypt_device *ctx, const char *device,
const char *cipher_spec, const char *mode, size_t keyLength) const char *cipher, const char *mode, size_t keyLength)
{ {
char cipher_spec[MAX_CIPHER_LEN * 3];
if (snprintf(cipher_spec, sizeof(cipher_spec), "%s-%s", cipher, mode) < 0)
return;
log_err(ctx, _("Failed to setup dm-crypt key mapping for device %s.\n" log_err(ctx, _("Failed to setup dm-crypt key mapping for device %s.\n"
"Check that kernel supports %s cipher (check syslog for more info).\n"), "Check that kernel supports %s cipher (check syslog for more info).\n"),
device, cipher_spec); device, cipher_spec);
@@ -97,7 +102,7 @@ static int LUKS_endec_template(char *src, size_t srcLength,
if (r < 0) { if (r < 0) {
if (r != -EACCES && r != -ENOTSUP) if (r != -EACCES && r != -ENOTSUP)
_error_hint(ctx, device_path(dmd.data_device), _error_hint(ctx, device_path(dmd.data_device),
cipher_spec, cipher_mode, vk->keylength * 8); cipher, cipher_mode, vk->keylength * 8);
return -EIO; return -EIO;
} }
@@ -140,13 +145,16 @@ int LUKS_encrypt_to_storage(char *src, size_t srcLength,
/* Encrypt buffer */ /* Encrypt buffer */
r = crypt_storage_init(&s, 0, cipher, cipher_mode, vk->key, vk->keylength); r = crypt_storage_init(&s, 0, cipher, cipher_mode, vk->key, vk->keylength);
if (r)
log_dbg("Userspace crypto wrapper cannot use %s-%s (%d).",
cipher, cipher_mode, r);
/* Fallback to old temporary dmcrypt device */ /* Fallback to old temporary dmcrypt device */
if (r == -ENOTSUP) if (r == -ENOTSUP || r == -ENOENT)
return LUKS_endec_template(src, srcLength, cipher, cipher_mode, return LUKS_endec_template(src, srcLength, cipher, cipher_mode,
vk, sector, write_blockwise, O_RDWR, ctx); vk, sector, write_blockwise, O_RDWR, ctx);
if (r) { if (r) {
log_dbg("Userspace crypto wrapper failed to initialize %s-%s (%d).",
cipher, cipher_mode, r);
_error_hint(ctx, device_path(device), cipher, cipher_mode, _error_hint(ctx, device_path(device), cipher, cipher_mode,
vk->keylength * 8); vk->keylength * 8);
return r; return r;
@@ -194,13 +202,16 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength,
r = crypt_storage_init(&s, 0, cipher, cipher_mode, vk->key, vk->keylength); r = crypt_storage_init(&s, 0, cipher, cipher_mode, vk->key, vk->keylength);
if (r)
log_dbg("Userspace crypto wrapper cannot use %s-%s (%d).",
cipher, cipher_mode, r);
/* Fallback to old temporary dmcrypt device */ /* Fallback to old temporary dmcrypt device */
if (r == -ENOTSUP) if (r == -ENOTSUP || r == -ENOENT)
return LUKS_endec_template(dst, dstLength, cipher, cipher_mode, return LUKS_endec_template(dst, dstLength, cipher, cipher_mode,
vk, sector, read_blockwise, O_RDONLY, ctx); vk, sector, read_blockwise, O_RDONLY, ctx);
if (r) { if (r) {
log_dbg("Userspace crypto wrapper failed to initialize %s-%s (%d).",
cipher, cipher_mode, r);
_error_hint(ctx, device_path(device), cipher, cipher_mode, _error_hint(ctx, device_path(device), cipher, cipher_mode,
vk->keylength * 8); vk->keylength * 8);
return r; return r;