Commit 5996c7c2 authored by Lennart Poettering's avatar Lennart Poettering

journald: don't reposition window if we don't have to

parent c4164442
...@@ -66,7 +66,7 @@ int journal_file_append_tag(JournalFile *f) { ...@@ -66,7 +66,7 @@ int journal_file_append_tag(JournalFile *f) {
/* Add the tag object itself, so that we can protect its /* Add the tag object itself, so that we can protect its
* header. This will exclude the actual hash value in it */ * header. This will exclude the actual hash value in it */
r = journal_file_hmac_put_object(f, OBJECT_TAG, p); r = journal_file_hmac_put_object(f, OBJECT_TAG, o, p);
if (r < 0) if (r < 0)
return r; return r;
...@@ -229,9 +229,8 @@ int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) { ...@@ -229,9 +229,8 @@ 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, uint64_t p) { int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p) {
int r; int r;
Object *o;
assert(f); assert(f);
...@@ -242,9 +241,14 @@ int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p) { ...@@ -242,9 +241,14 @@ int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p) {
if (r < 0) if (r < 0)
return r; return r;
r = journal_file_move_to_object(f, type, p, &o); if (!o) {
if (r < 0) r = journal_file_move_to_object(f, type, p, &o);
return r; if (r < 0)
return r;
} else {
if (type >= 0 && o->object.type != type)
return -EBADMSG;
}
gcry_md_write(f->hmac, o, offsetof(ObjectHeader, payload)); gcry_md_write(f->hmac, o, offsetof(ObjectHeader, payload));
...@@ -460,7 +464,7 @@ int journal_file_append_first_tag(JournalFile *f) { ...@@ -460,7 +464,7 @@ int journal_file_append_first_tag(JournalFile *f) {
return -EINVAL; return -EINVAL;
p -= offsetof(Object, hash_table.items); p -= offsetof(Object, hash_table.items);
r = journal_file_hmac_put_object(f, OBJECT_FIELD_HASH_TABLE, p); r = journal_file_hmac_put_object(f, OBJECT_FIELD_HASH_TABLE, NULL, p);
if (r < 0) if (r < 0)
return r; return r;
...@@ -469,7 +473,7 @@ int journal_file_append_first_tag(JournalFile *f) { ...@@ -469,7 +473,7 @@ int journal_file_append_first_tag(JournalFile *f) {
return -EINVAL; return -EINVAL;
p -= offsetof(Object, hash_table.items); p -= offsetof(Object, hash_table.items);
r = journal_file_hmac_put_object(f, OBJECT_DATA_HASH_TABLE, p); r = journal_file_hmac_put_object(f, OBJECT_DATA_HASH_TABLE, NULL, p);
if (r < 0) if (r < 0)
return r; return r;
......
...@@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f); ...@@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f);
int journal_file_hmac_setup(JournalFile *f); int journal_file_hmac_setup(JournalFile *f);
int journal_file_hmac_start(JournalFile *f); int journal_file_hmac_start(JournalFile *f);
int journal_file_hmac_put_header(JournalFile *f); int journal_file_hmac_put_header(JournalFile *f);
int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p); int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p);
int journal_file_fss_load(JournalFile *f); int journal_file_fss_load(JournalFile *f);
int journal_file_parse_verification_key(JournalFile *f, const char *key); int journal_file_parse_verification_key(JournalFile *f, const char *key);
......
...@@ -775,18 +775,18 @@ static int journal_file_append_data( ...@@ -775,18 +775,18 @@ static int journal_file_append_data(
if (r < 0) if (r < 0)
return r; return r;
#ifdef HAVE_GCRYPT
r = journal_file_hmac_put_object(f, OBJECT_DATA, p);
if (r < 0)
return r;
#endif
/* The linking might have altered the window, so let's /* The linking might have altered the window, so let's
* refresh our pointer */ * refresh our pointer */
r = journal_file_move_to_object(f, OBJECT_DATA, p, &o); r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
if (r < 0) if (r < 0)
return r; return r;
#ifdef HAVE_GCRYPT
r = journal_file_hmac_put_object(f, OBJECT_DATA, o, p);
if (r < 0)
return r;
#endif
if (ret) if (ret)
*ret = o; *ret = o;
...@@ -866,7 +866,7 @@ static int link_entry_into_array(JournalFile *f, ...@@ -866,7 +866,7 @@ static int link_entry_into_array(JournalFile *f,
return r; return r;
#ifdef HAVE_GCRYPT #ifdef HAVE_GCRYPT
r = journal_file_hmac_put_object(f, OBJECT_ENTRY_ARRAY, q); r = journal_file_hmac_put_object(f, OBJECT_ENTRY_ARRAY, o, q);
if (r < 0) if (r < 0)
return r; return r;
#endif #endif
...@@ -1012,7 +1012,7 @@ static int journal_file_append_entry_internal( ...@@ -1012,7 +1012,7 @@ static int journal_file_append_entry_internal(
o->entry.boot_id = f->header->boot_id; o->entry.boot_id = f->header->boot_id;
#ifdef HAVE_GCRYPT #ifdef HAVE_GCRYPT
r = journal_file_hmac_put_object(f, OBJECT_ENTRY, np); r = journal_file_hmac_put_object(f, OBJECT_ENTRY, o, np);
if (r < 0) if (r < 0)
return r; return r;
#endif #endif
......
...@@ -959,7 +959,7 @@ int journal_file_verify( ...@@ -959,7 +959,7 @@ int journal_file_verify(
if (r < 0) if (r < 0)
goto fail; goto fail;
r = journal_file_hmac_put_object(f, -1, q); r = journal_file_hmac_put_object(f, -1, o, q);
if (r < 0) if (r < 0)
goto fail; goto fail;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment