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

Make crypt_activate_by_pin_token addition backward compatible.

Browse Source 
The crypt_activate_by_pin_token may be used only from new
dynamicly loadable token plugins.

Also refactors code for dynamically loadable plugins so
that it does not use crypt_token_handler structure anymore.

Old structure remains used only in crypt_token_register call.
This commit is contained in:
Ondrej Kozina
2021-01-21 17:23:15 +01:00
parent 81c44b5eee
commit 10e4d8fbac
4 changed files with 137 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/luks2/luks2_token_keyring.c
View File

@@ -23,7 +23,7 @@
#include "luks2_internal.h"
static int keyring_open(struct crypt_device *cd,
int keyring_open(struct crypt_device *cd,
int token,
char **buffer,
size_t *buffer_len,
@@ -54,7 +54,7 @@ static int keyring_open(struct crypt_device *cd,
return 0;
}
static int keyring_validate(struct crypt_device *cd __attribute__((unused)),
int keyring_validate(struct crypt_device *cd __attribute__((unused)),
const char *json)
{
enum json_tokener_error jerr;
@@ -92,7 +92,7 @@ out:
return r;
}
static void keyring_dump(struct crypt_device *cd, const char *json)
void keyring_dump(struct crypt_device *cd, const char *json)
{
enum json_tokener_error jerr;
json_object *jobj_token, *jobj_key;
@@ -135,10 +135,3 @@ int LUKS2_token_keyring_get(struct crypt_device *cd, struct luks2_hdr *hdr, int
return token;
}
const crypt_token_handler keyring_handler = {
.name = LUKS2_TOKEN_KEYRING,
.open = keyring_open,
.validate = keyring_validate,
.dump = keyring_dump
};