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

Add error hint for wrongly formatted cipher strings in LUKS1.

Browse Source
This commit is contained in:
Milan Broz
2018-01-19 11:09:06 +01:00
parent f6e613a76f
commit d399dfa792
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/luks1/keyencryption.c
View File

@@ -21,6 +21,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "luks.h" #include "luks.h"
@@ -30,7 +31,7 @@
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, const char *mode, size_t keyLength) const char *cipher, const char *mode, size_t keyLength)
{ {
char cipher_spec[MAX_CIPHER_LEN * 3]; char *c, cipher_spec[MAX_CIPHER_LEN * 3];
if (snprintf(cipher_spec, sizeof(cipher_spec), "%s-%s", cipher, mode) < 0) if (snprintf(cipher_spec, sizeof(cipher_spec), "%s-%s", cipher, mode) < 0)
return; return;
@@ -41,6 +42,8 @@ static void _error_hint(struct crypt_device *ctx, const char *device,
if (!strncmp(mode, "xts", 3) && (keyLength != 256 && keyLength != 512)) if (!strncmp(mode, "xts", 3) && (keyLength != 256 && keyLength != 512))
log_err(ctx, _("Key size in XTS mode must be 256 or 512 bits.\n")); log_err(ctx, _("Key size in XTS mode must be 256 or 512 bits.\n"));
else if (!(c = strchr(mode, '-')) || strlen(c) < 4)
log_err(ctx, _("Cipher specification should be in [cipher]-[mode]-[iv] format.\n"));
} }
static int LUKS_endec_template(char *src, size_t srcLength, static int LUKS_endec_template(char *src, size_t srcLength,