SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-authenticate: move one more function

Browse Source
This commit is contained in:
Yu Watanabe
2026-06-27 23:54:46 +09:00
parent 130eca9323
commit ede9ff4c8b
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/journal-authenticate.c
+35 -35
View File
@@ -237,6 +237,41 @@ int journal_file_hmac_setup(JournalFile *f) {
#endif
}
int journal_file_hmac_start(JournalFile *f) {
#if HAVE_GCRYPT
int r;
assert(f);
if (!JOURNAL_HEADER_SEALED(f->header))
return 0;
if (f->hmac_running)
return 0;
/* Prepare HMAC for next cycle */
sym_gcry_md_reset(f->hmac);
uint8_t key[256 / 8]; /* Let's pass 256 bit from FSPRG to HMAC */
CLEANUP_ERASE(key);
r = FSPRG_GetKey(f->fsprg_state.iov_base, key, sizeof(key), 0);
if (r < 0)
return r;
gcry_error_t err = sym_gcry_md_setkey(f->hmac, key, sizeof(key));
if (gcry_err_code(err) != GPG_ERR_NO_ERROR)
return log_debug_errno(SYNTHETIC_ERRNO(EIO),
"sym_gcry_md_setkey() failed with error code: %s",
sym_gcry_strerror(err));
f->hmac_running = true;
return 0;
#else
return -EOPNOTSUPP;
#endif
}
int journal_file_append_tag(JournalFile *f) {
#if HAVE_GCRYPT
int r;
@@ -285,41 +320,6 @@ int journal_file_append_tag(JournalFile *f) {
#endif
}
int journal_file_hmac_start(JournalFile *f) {
#if HAVE_GCRYPT
int r;
assert(f);
if (!JOURNAL_HEADER_SEALED(f->header))
return 0;
if (f->hmac_running)
return 0;
/* Prepare HMAC for next cycle */
sym_gcry_md_reset(f->hmac);
uint8_t key[256 / 8]; /* Let's pass 256 bit from FSPRG to HMAC */
CLEANUP_ERASE(key);
r = FSPRG_GetKey(f->fsprg_state.iov_base, key, sizeof(key), 0);
if (r < 0)
return r;
gcry_error_t err = sym_gcry_md_setkey(f->hmac, key, sizeof(key));
if (gcry_err_code(err) != GPG_ERR_NO_ERROR)
return log_debug_errno(SYNTHETIC_ERRNO(EIO),
"sym_gcry_md_setkey() failed with error code: %s",
sym_gcry_strerror(err));
f->hmac_running = true;
return 0;
#else
return -EOPNOTSUPP;
#endif
}
static int journal_file_get_epoch(JournalFile *f, uint64_t realtime, uint64_t *epoch) {
uint64_t t;