mirror of
https://github.com/systemd/systemd.git
synced 2025-02-27 01:57:35 +03:00
cryptsetup-util: Always define dlopen_cryptsetup()
This commit is contained in:
Daan De Meyer
parent
3388a4b582
commit
bbf73b0069
@ -50,63 +50,6 @@ int (*sym_crypt_token_max)(const char *type);
|
|||||||
crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
|
crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
|
||||||
int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
|
int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
|
||||||
|
|
||||||
int dlopen_cryptsetup(void) {
|
|
||||||
int r;
|
|
||||||
|
|
||||||
r = dlopen_many_sym_or_warn(
|
|
||||||
&cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
|
|
||||||
DLSYM_ARG(crypt_activate_by_passphrase),
|
|
||||||
#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
|
|
||||||
DLSYM_ARG(crypt_activate_by_signed_key),
|
|
||||||
#endif
|
|
||||||
DLSYM_ARG(crypt_activate_by_volume_key),
|
|
||||||
DLSYM_ARG(crypt_deactivate_by_name),
|
|
||||||
DLSYM_ARG(crypt_format),
|
|
||||||
DLSYM_ARG(crypt_free),
|
|
||||||
DLSYM_ARG(crypt_get_cipher),
|
|
||||||
DLSYM_ARG(crypt_get_cipher_mode),
|
|
||||||
DLSYM_ARG(crypt_get_data_offset),
|
|
||||||
DLSYM_ARG(crypt_get_device_name),
|
|
||||||
DLSYM_ARG(crypt_get_dir),
|
|
||||||
DLSYM_ARG(crypt_get_type),
|
|
||||||
DLSYM_ARG(crypt_get_uuid),
|
|
||||||
DLSYM_ARG(crypt_get_verity_info),
|
|
||||||
DLSYM_ARG(crypt_get_volume_key_size),
|
|
||||||
DLSYM_ARG(crypt_init),
|
|
||||||
DLSYM_ARG(crypt_init_by_name),
|
|
||||||
DLSYM_ARG(crypt_keyslot_add_by_volume_key),
|
|
||||||
DLSYM_ARG(crypt_keyslot_destroy),
|
|
||||||
DLSYM_ARG(crypt_keyslot_max),
|
|
||||||
DLSYM_ARG(crypt_load),
|
|
||||||
DLSYM_ARG(crypt_resize),
|
|
||||||
DLSYM_ARG(crypt_resume_by_passphrase),
|
|
||||||
DLSYM_ARG(crypt_set_data_device),
|
|
||||||
DLSYM_ARG(crypt_set_debug_level),
|
|
||||||
DLSYM_ARG(crypt_set_log_callback),
|
|
||||||
#if HAVE_CRYPT_SET_METADATA_SIZE
|
|
||||||
DLSYM_ARG(crypt_set_metadata_size),
|
|
||||||
#endif
|
|
||||||
DLSYM_ARG(crypt_set_pbkdf_type),
|
|
||||||
DLSYM_ARG(crypt_suspend),
|
|
||||||
DLSYM_ARG(crypt_token_json_get),
|
|
||||||
DLSYM_ARG(crypt_token_json_set),
|
|
||||||
#if HAVE_CRYPT_TOKEN_MAX
|
|
||||||
DLSYM_ARG(crypt_token_max),
|
|
||||||
#endif
|
|
||||||
DLSYM_ARG(crypt_token_status),
|
|
||||||
DLSYM_ARG(crypt_volume_key_get));
|
|
||||||
if (r <= 0)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
/* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
|
|
||||||
* libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
|
|
||||||
* whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
|
|
||||||
* other code loaded into this process also changes the global log functions of libcryptsetup, who
|
|
||||||
* knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
|
|
||||||
cryptsetup_enable_logging(NULL);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
|
static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
|
||||||
|
|
||||||
switch (level) {
|
switch (level) {
|
||||||
@ -246,6 +189,67 @@ int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
int dlopen_cryptsetup(void) {
|
||||||
|
#if HAVE_LIBCRYPTSETUP
|
||||||
|
int r;
|
||||||
|
|
||||||
|
r = dlopen_many_sym_or_warn(
|
||||||
|
&cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
|
||||||
|
DLSYM_ARG(crypt_activate_by_passphrase),
|
||||||
|
#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
|
||||||
|
DLSYM_ARG(crypt_activate_by_signed_key),
|
||||||
|
#endif
|
||||||
|
DLSYM_ARG(crypt_activate_by_volume_key),
|
||||||
|
DLSYM_ARG(crypt_deactivate_by_name),
|
||||||
|
DLSYM_ARG(crypt_format),
|
||||||
|
DLSYM_ARG(crypt_free),
|
||||||
|
DLSYM_ARG(crypt_get_cipher),
|
||||||
|
DLSYM_ARG(crypt_get_cipher_mode),
|
||||||
|
DLSYM_ARG(crypt_get_data_offset),
|
||||||
|
DLSYM_ARG(crypt_get_device_name),
|
||||||
|
DLSYM_ARG(crypt_get_dir),
|
||||||
|
DLSYM_ARG(crypt_get_type),
|
||||||
|
DLSYM_ARG(crypt_get_uuid),
|
||||||
|
DLSYM_ARG(crypt_get_verity_info),
|
||||||
|
DLSYM_ARG(crypt_get_volume_key_size),
|
||||||
|
DLSYM_ARG(crypt_init),
|
||||||
|
DLSYM_ARG(crypt_init_by_name),
|
||||||
|
DLSYM_ARG(crypt_keyslot_add_by_volume_key),
|
||||||
|
DLSYM_ARG(crypt_keyslot_destroy),
|
||||||
|
DLSYM_ARG(crypt_keyslot_max),
|
||||||
|
DLSYM_ARG(crypt_load),
|
||||||
|
DLSYM_ARG(crypt_resize),
|
||||||
|
DLSYM_ARG(crypt_resume_by_passphrase),
|
||||||
|
DLSYM_ARG(crypt_set_data_device),
|
||||||
|
DLSYM_ARG(crypt_set_debug_level),
|
||||||
|
DLSYM_ARG(crypt_set_log_callback),
|
||||||
|
#if HAVE_CRYPT_SET_METADATA_SIZE
|
||||||
|
DLSYM_ARG(crypt_set_metadata_size),
|
||||||
|
#endif
|
||||||
|
DLSYM_ARG(crypt_set_pbkdf_type),
|
||||||
|
DLSYM_ARG(crypt_suspend),
|
||||||
|
DLSYM_ARG(crypt_token_json_get),
|
||||||
|
DLSYM_ARG(crypt_token_json_set),
|
||||||
|
#if HAVE_CRYPT_TOKEN_MAX
|
||||||
|
DLSYM_ARG(crypt_token_max),
|
||||||
|
#endif
|
||||||
|
DLSYM_ARG(crypt_token_status),
|
||||||
|
DLSYM_ARG(crypt_volume_key_get));
|
||||||
|
if (r <= 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
|
/* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
|
||||||
|
* libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
|
||||||
|
* whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
|
||||||
|
* other code loaded into this process also changes the global log functions of libcryptsetup, who
|
||||||
|
* knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
|
||||||
|
cryptsetup_enable_logging(NULL);
|
||||||
|
return 1;
|
||||||
|
#else
|
||||||
|
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in.");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int cryptsetup_get_keyslot_from_token(JsonVariant *v) {
|
int cryptsetup_get_keyslot_from_token(JsonVariant *v) {
|
||||||
int keyslot, r;
|
int keyslot, r;
|
||||||
JsonVariant *w;
|
JsonVariant *w;
|
||||||
|
|||||||
@ -65,8 +65,6 @@ static inline int crypt_token_max(_unused_ const char *type) {
|
|||||||
extern crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
|
extern crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
|
||||||
extern int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
|
extern int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
|
||||||
|
|
||||||
int dlopen_cryptsetup(void);
|
|
||||||
|
|
||||||
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
|
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
|
||||||
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
|
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
|
||||||
|
|
||||||
@ -91,6 +89,8 @@ static inline void sym_crypt_freep(struct crypt_device** cd) {}
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
int dlopen_cryptsetup(void);
|
||||||
|
|
||||||
int cryptsetup_get_keyslot_from_token(JsonVariant *v);
|
int cryptsetup_get_keyslot_from_token(JsonVariant *v);
|
||||||
|
|
||||||
static inline const char *mangle_none(const char *s) {
|
static inline const char *mangle_none(const char *s) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user