sd-journal: drop libgcrypt dependency from libsystemd
This introduce a vtable for journal tagging feature in sd-journal, and makes libgcrypt dependent features loaded by users (journald, journalctl, journal-remote, and unit tests) when necessary.
This commit is contained in:
Yu Watanabe
@@ -1,118 +0,0 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include <sys/syslog.h>
|
||||
|
||||
#include "sd-dlopen.h"
|
||||
|
||||
#include "gcrypt-util.h"
|
||||
#include "log.h" /* IWYU pragma: keep */
|
||||
|
||||
#if HAVE_GCRYPT
|
||||
|
||||
static DLSYM_PROTOTYPE(gcry_control) = NULL;
|
||||
static DLSYM_PROTOTYPE(gcry_check_version) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_close) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_copy) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_ctl) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_get_algo_dlen) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_open) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_read) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_reset) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_setkey) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_md_write) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_add) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_add_ui) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_cmp) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_cmp_ui) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_get_nbits) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_invm) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_mod) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_mul) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_mulm) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_new) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_powm) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_print) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_release) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_scan) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_set_ui) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_sub) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_subm) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_mpi_sub_ui) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_prime_check) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_randomize) = NULL;
|
||||
DLSYM_PROTOTYPE(gcry_strerror) = NULL;
|
||||
#endif
|
||||
|
||||
int dlopen_gcrypt(int log_level) {
|
||||
#if HAVE_GCRYPT
|
||||
static void *gcrypt_dl = NULL;
|
||||
|
||||
GCRYPT_NOTE(SD_ELF_NOTE_DLOPEN_PRIORITY_SUGGESTED);
|
||||
|
||||
return dlopen_many_sym_or_warn(
|
||||
&gcrypt_dl,
|
||||
"libgcrypt.so.20", log_level,
|
||||
DLSYM_ARG(gcry_control),
|
||||
DLSYM_ARG(gcry_check_version),
|
||||
DLSYM_ARG(gcry_md_close),
|
||||
DLSYM_ARG(gcry_md_copy),
|
||||
DLSYM_ARG(gcry_md_ctl),
|
||||
DLSYM_ARG(gcry_md_get_algo_dlen),
|
||||
DLSYM_ARG(gcry_md_open),
|
||||
DLSYM_ARG(gcry_md_read),
|
||||
DLSYM_ARG(gcry_md_reset),
|
||||
DLSYM_ARG(gcry_md_setkey),
|
||||
DLSYM_ARG(gcry_md_write),
|
||||
DLSYM_ARG(gcry_mpi_add),
|
||||
DLSYM_ARG(gcry_mpi_add_ui),
|
||||
DLSYM_ARG(gcry_mpi_cmp),
|
||||
DLSYM_ARG(gcry_mpi_cmp_ui),
|
||||
DLSYM_ARG(gcry_mpi_get_nbits),
|
||||
DLSYM_ARG(gcry_mpi_invm),
|
||||
DLSYM_ARG(gcry_mpi_mod),
|
||||
DLSYM_ARG(gcry_mpi_mul),
|
||||
DLSYM_ARG(gcry_mpi_mulm),
|
||||
DLSYM_ARG(gcry_mpi_new),
|
||||
DLSYM_ARG(gcry_mpi_powm),
|
||||
DLSYM_ARG(gcry_mpi_print),
|
||||
DLSYM_ARG(gcry_mpi_release),
|
||||
DLSYM_ARG(gcry_mpi_scan),
|
||||
DLSYM_ARG(gcry_mpi_set_ui),
|
||||
DLSYM_ARG(gcry_mpi_sub),
|
||||
DLSYM_ARG(gcry_mpi_subm),
|
||||
DLSYM_ARG(gcry_mpi_sub_ui),
|
||||
DLSYM_ARG(gcry_prime_check),
|
||||
DLSYM_ARG(gcry_randomize),
|
||||
DLSYM_ARG(gcry_strerror));
|
||||
#else
|
||||
return log_full_errno(log_level, SYNTHETIC_ERRNO(EOPNOTSUPP),
|
||||
"gcrypt support is not compiled in.");
|
||||
#endif
|
||||
}
|
||||
|
||||
int initialize_libgcrypt(bool secmem) {
|
||||
#if HAVE_GCRYPT
|
||||
int r;
|
||||
|
||||
r = dlopen_gcrypt(LOG_DEBUG);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (sym_gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
|
||||
return 0;
|
||||
|
||||
sym_gcry_control(GCRYCTL_SET_PREFERRED_RNG_TYPE, GCRY_RNG_TYPE_SYSTEM);
|
||||
assert_se(sym_gcry_check_version("1.4.5"));
|
||||
|
||||
/* Turn off "secmem". Clients which wish to make use of this
|
||||
* feature should initialize the library manually */
|
||||
if (!secmem)
|
||||
sym_gcry_control(GCRYCTL_DISABLE_SECMEM);
|
||||
|
||||
sym_gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
|
||||
|
||||
return 0;
|
||||
#else
|
||||
return -EOPNOTSUPP;
|
||||
#endif
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "sd-dlopen.h"
|
||||
|
||||
#include "basic-forward.h"
|
||||
|
||||
int dlopen_gcrypt(int log_level);
|
||||
|
||||
int initialize_libgcrypt(bool secmem);
|
||||
|
||||
#if HAVE_GCRYPT
|
||||
#define GCRYPT_NOTE(priority) \
|
||||
SD_ELF_NOTE_DLOPEN("gcrypt", \
|
||||
"Support for journald forward-sealing", \
|
||||
priority, \
|
||||
"libgcrypt.so.20")
|
||||
|
||||
#define DLOPEN_GCRYPT(log_level, priority) \
|
||||
({ \
|
||||
GCRYPT_NOTE(priority); \
|
||||
dlopen_gcrypt(log_level); \
|
||||
})
|
||||
|
||||
#include <gcrypt.h> /* IWYU pragma: export */
|
||||
|
||||
#include "dlfcn-util.h"
|
||||
|
||||
extern DLSYM_PROTOTYPE(gcry_md_close);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_copy);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_ctl);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_get_algo_dlen);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_open);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_read);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_reset);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_setkey);
|
||||
extern DLSYM_PROTOTYPE(gcry_md_write);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_add);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_add_ui);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_cmp);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_cmp_ui);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_get_nbits);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_invm);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_mod);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_mul);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_mulm);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_new);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_powm);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_print);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_release);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_scan);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_set_ui);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_sub);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_subm);
|
||||
extern DLSYM_PROTOTYPE(gcry_mpi_sub_ui);
|
||||
extern DLSYM_PROTOTYPE(gcry_prime_check);
|
||||
extern DLSYM_PROTOTYPE(gcry_randomize);
|
||||
extern DLSYM_PROTOTYPE(gcry_strerror);
|
||||
|
||||
/* Copied from gcry_md_putc from gcrypt.h due to the need to call the sym_ variant */
|
||||
#define sym_gcry_md_putc(h,c) \
|
||||
do { \
|
||||
gcry_md_hd_t h__ = (h); \
|
||||
if ((h__)->bufpos == (h__)->bufsize) \
|
||||
sym_gcry_md_write((h__), NULL, 0); \
|
||||
(h__)->buf[(h__)->bufpos++] = (c) & 0xff; \
|
||||
} while(false)
|
||||
#else
|
||||
#define DLOPEN_GCRYPT(log_level, priority) dlopen_gcrypt(log_level)
|
||||
|
||||
typedef struct gcry_md_handle *gcry_md_hd_t;
|
||||
|
||||
static inline void sym_gcry_md_close(gcry_md_hd_t h) {
|
||||
assert(h == NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(gcry_md_hd_t, sym_gcry_md_close, NULL);
|
||||
@@ -42,7 +42,6 @@ basic_sources = files(
|
||||
'format-ifname.c',
|
||||
'format-util.c',
|
||||
'fs-util.c',
|
||||
'gcrypt-util.c',
|
||||
'glob-util.c',
|
||||
'glyph-util.c',
|
||||
'gunicode.c',
|
||||
@@ -214,7 +213,6 @@ libbasic_static = static_library(
|
||||
include_directories : basic_includes,
|
||||
implicit_include_directories : false,
|
||||
dependencies : [libbzip2_cflags,
|
||||
libgcrypt_cflags,
|
||||
liblz4_cflags,
|
||||
libxz_cflags,
|
||||
libz_cflags,
|
||||
|
||||
Reference in New Issue
Block a user