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

Allow dash and underscore chars in external token names.

Browse Source 
Current alphabet for external token types is alphanumeric
characters including '-' and '_'. Empty strings are also
forbiden.
This commit is contained in:
Ondrej Kozina
2021-03-16 18:15:03 +01:00
parent 5d0a11a21b
commit 36805b3cfe
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/luks2/luks2.h
View File

@@ -44,6 +44,8 @@
#define LUKS2_BUILTIN_TOKEN_PREFIX "luks2-" #define LUKS2_BUILTIN_TOKEN_PREFIX "luks2-"
#define LUKS2_BUILTIN_TOKEN_PREFIX_LEN 6 #define LUKS2_BUILTIN_TOKEN_PREFIX_LEN 6
#define LUKS2_TOKEN_NAME_MAX 64
#define LUKS2_TOKEN_KEYRING LUKS2_BUILTIN_TOKEN_PREFIX "keyring" #define LUKS2_TOKEN_KEYRING LUKS2_BUILTIN_TOKEN_PREFIX "keyring"
#define LUKS2_DIGEST_MAX 8 #define LUKS2_DIGEST_MAX 8

27
lib/luks2/luks2_token.c
View File

@@ -93,6 +93,20 @@ static bool token_validate_v2(struct crypt_device *cd, const struct crypt_token_
return true; return true;
} }
static bool external_token_name_valid(const char *name)
{
if (!*name || strlen(name) > LUKS2_TOKEN_NAME_MAX)
return false;
while (*name) {
if (!isalnum(*name) && *name != '-' && *name != '_')
return false;
name++;
}
return true;
}
#endif #endif
static int static int
@@ -102,16 +116,17 @@ crypt_token_load_external(struct crypt_device *cd, const char *name, struct cryp
struct crypt_token_handler_v2 *token; struct crypt_token_handler_v2 *token;
void *h; void *h;
char buf[512]; char buf[512];
int i, r; int r;
if (!ret || !name || strlen(name) > 64) if (!ret || !name)
return -EINVAL; return -EINVAL;
token = &ret->u.v2; if (!external_token_name_valid(name)) {
log_dbg(cd, "External token name (%.*s) invalid.", LUKS2_TOKEN_NAME_MAX, name);
return -EINVAL;
}
for (i = 0; name[i]; i++) token = &ret->u.v2;
if (!isalnum(name[i]))
return -EINVAL;
r = snprintf(buf, sizeof(buf), "libcryptsetup-token-%s.so", name); r = snprintf(buf, sizeof(buf), "libcryptsetup-token-%s.so", name);
if (r < 0 || (size_t)r >= sizeof(buf)) if (r < 0 || (size_t)r >= sizeof(buf))