chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move DEFINE_TRIVIAL_CLEANUP_FUNC to macro.h
[elogind.git]
/
src
/
journal
/
journal-authenticate.c
diff --git
a/src/journal/journal-authenticate.c
b/src/journal/journal-authenticate.c
index 674f81218f4c3489fb570f8461e7e62ea58a8537..b3e2601c4e18976e9a85dd85a12dfb8c81b77c75 100644
(file)
--- a/
src/journal/journal-authenticate.c
+++ b/
src/journal/journal-authenticate.c
@@
-60,9
+60,9
@@
int journal_file_append_tag(JournalFile *f) {
o->tag.seqnum = htole64(journal_file_tag_seqnum(f));
o->tag.epoch = htole64(FSPRG_GetEpoch(f->fsprg_state));
o->tag.seqnum = htole64(journal_file_tag_seqnum(f));
o->tag.epoch = htole64(FSPRG_GetEpoch(f->fsprg_state));
- log_debug("Writing tag %
llu for epoch %llu\n
",
-
(unsigned long long)
le64toh(o->tag.seqnum),
-
(unsigned long long)
FSPRG_GetEpoch(f->fsprg_state));
+ log_debug("Writing tag %
"PRIu64" for epoch %"PRIu64"
",
+ le64toh(o->tag.seqnum),
+ FSPRG_GetEpoch(f->fsprg_state));
/* Add the tag object itself, so that we can protect its
* header. This will exclude the actual hash value in it */
/* Add the tag object itself, so that we can protect its
* header. This will exclude the actual hash value in it */
@@
-152,7
+152,7
@@
int journal_file_fsprg_evolve(JournalFile *f, uint64_t realtime) {
epoch = FSPRG_GetEpoch(f->fsprg_state);
if (epoch < goal)
epoch = FSPRG_GetEpoch(f->fsprg_state);
if (epoch < goal)
- log_debug("Evolving FSPRG key from epoch %
llu to %llu.", (unsigned long long) epoch, (unsigned long long)
goal);
+ log_debug("Evolving FSPRG key from epoch %
"PRIu64" to %"PRIu64".", epoch,
goal);
for (;;) {
if (epoch > goal)
for (;;) {
if (epoch > goal)
@@
-195,7
+195,7
@@
int journal_file_fsprg_seek(JournalFile *f, uint64_t goal) {
return -ENOMEM;
}
return -ENOMEM;
}
- log_debug("Seeking FSPRG key to %
llu.", (unsigned long long)
goal);
+ log_debug("Seeking FSPRG key to %
"PRIu64".",
goal);
msk = alloca(FSPRG_mskinbytes(FSPRG_RECOMMENDED_SECPAR));
FSPRG_GenMK(msk, NULL, f->fsprg_seed, f->fsprg_seed_size, FSPRG_RECOMMENDED_SECPAR);
msk = alloca(FSPRG_mskinbytes(FSPRG_RECOMMENDED_SECPAR));
FSPRG_GenMK(msk, NULL, f->fsprg_seed, f->fsprg_seed_size, FSPRG_RECOMMENDED_SECPAR);
@@
-229,7
+229,7
@@
int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) {
return 0;
}
return 0;
}
-int journal_file_hmac_put_object(JournalFile *f,
int
type, Object *o, uint64_t p) {
+int journal_file_hmac_put_object(JournalFile *f,
ObjectType
type, Object *o, uint64_t p) {
int r;
assert(f);
int r;
assert(f);
@@
-246,7
+246,7
@@
int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
if (r < 0)
return r;
} else {
if (r < 0)
return r;
} else {
- if (type >
= 0
&& o->object.type != type)
+ if (type >
OBJECT_UNUSED
&& o->object.type != type)
return -EBADMSG;
}
return -EBADMSG;
}
@@
-260,6
+260,12
@@
int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
gcry_md_write(f->hmac, o->data.payload, le64toh(o->object.size) - offsetof(DataObject, payload));
break;
gcry_md_write(f->hmac, o->data.payload, le64toh(o->object.size) - offsetof(DataObject, payload));
break;
+ case OBJECT_FIELD:
+ /* Same here */
+ gcry_md_write(f->hmac, &o->field.hash, sizeof(o->field.hash));
+ gcry_md_write(f->hmac, o->field.payload, le64toh(o->object.size) - offsetof(FieldObject, payload));
+ break;
+
case OBJECT_ENTRY:
/* All */
gcry_md_write(f->hmac, &o->entry.seqnum, le64toh(o->object.size) - offsetof(EntryObject, seqnum));
case OBJECT_ENTRY:
/* All */
gcry_md_write(f->hmac, &o->entry.seqnum, le64toh(o->object.size) - offsetof(EntryObject, seqnum));
@@
-333,7
+339,7
@@
int journal_file_fss_load(JournalFile *f) {
fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY, 0600);
if (fd < 0) {
if (errno != ENOENT)
fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY, 0600);
if (fd < 0) {
if (errno != ENOENT)
- log_error
(
"Failed to open %s: %m", p);
+ log_error
_errno(errno,
"Failed to open %s: %m", p);
r = -errno;
goto finish;
r = -errno;
goto finish;
@@
-412,10
+418,9
@@
finish:
if (m)
munmap(m, PAGE_ALIGN(sizeof(FSSHeader)));
if (m)
munmap(m, PAGE_ALIGN(sizeof(FSSHeader)));
- if (fd >= 0)
- close_nointr_nofail(fd);
-
+ safe_close(fd);
free(p);
free(p);
+
return r;
}
return r;
}
@@
-484,7
+489,6
@@
int journal_file_append_first_tag(JournalFile *f) {
return 0;
}
return 0;
}
-
int journal_file_parse_verification_key(JournalFile *f, const char *key) {
uint8_t *seed;
size_t seed_size, c;
int journal_file_parse_verification_key(JournalFile *f, const char *key) {
uint8_t *seed;
size_t seed_size, c;