X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.h;h=0305c97134e91e3633e31185294e2590e766255d;hb=beec00856158b703f2125a3d936080346a8a8de1;hp=eed49e062f496871e4367231404a1b0e5dd3b4ac;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;p=elogind.git

diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index eed49e062..0305c9713 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -23,29 +23,16 @@
 
 #include <inttypes.h>
 
+#ifdef HAVE_GCRYPT
+#include <gcrypt.h>
+#endif
+
 #include <systemd/sd-id128.h>
 
 #include "sparse-endian.h"
 #include "journal-def.h"
 #include "util.h"
-
-typedef struct Window {
-        void *ptr;
-        uint64_t offset;
-        uint64_t size;
-} Window;
-
-enum {
-        WINDOW_UNKNOWN = OBJECT_UNUSED,
-        WINDOW_DATA = OBJECT_DATA,
-        WINDOW_ENTRY = OBJECT_ENTRY,
-        WINDOW_DATA_HASH_TABLE = OBJECT_DATA_HASH_TABLE,
-        WINDOW_FIELD_HASH_TABLE = OBJECT_FIELD_HASH_TABLE,
-        WINDOW_ENTRY_ARRAY = OBJECT_ENTRY_ARRAY,
-        WINDOW_SIGNATURE = OBJECT_SIGNATURE,
-        WINDOW_HEADER,
-        _WINDOW_MAX
-};
+#include "mmap-cache.h"
 
 typedef struct JournalMetrics {
         uint64_t max_use;
@@ -59,27 +46,36 @@ typedef struct JournalFile {
         char *path;
         struct stat last_stat;
         mode_t mode;
+
         int flags;
         int prot;
         bool writable;
+        bool compress;
+        bool authenticate;
+
         bool tail_entry_monotonic_valid;
 
         Header *header;
         HashItem *data_hash_table;
         HashItem *field_hash_table;
 
-        Window windows[_WINDOW_MAX];
-
         uint64_t current_offset;
 
         JournalMetrics metrics;
-
-        bool compress;
+        MMapCache *mmap;
 
 #ifdef HAVE_XZ
         void *compress_buffer;
         uint64_t compress_buffer_size;
 #endif
+
+#ifdef HAVE_GCRYPT
+        gcry_md_hd_t hmac;
+        bool hmac_running;
+
+        FSPRGHeader *fsprg_header;
+        size_t fsprg_size;
+#endif
 } JournalFile;
 
 typedef enum direction {
@@ -91,7 +87,10 @@ int journal_file_open(
                 const char *fname,
                 int flags,
                 mode_t mode,
+                bool compress,
+                bool authenticate,
                 JournalMetrics *metrics,
+                MMapCache *mmap,
                 JournalFile *template,
                 JournalFile **ret);
 
@@ -101,7 +100,10 @@ int journal_file_open_reliably(
                 const char *fname,
                 int flags,
                 mode_t mode,
+                bool compress,
+                bool authenticate,
                 JournalMetrics *metrics,
+                MMapCache *mmap,
                 JournalFile *template,
                 JournalFile **ret);
 
@@ -134,7 +136,7 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
 void journal_file_dump(JournalFile *f);
 void journal_file_print_header(JournalFile *f);
 
-int journal_file_rotate(JournalFile **f);
+int journal_file_rotate(JournalFile **f, bool compress, bool authenticate);
 
 int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t min_free);
 
@@ -146,3 +148,7 @@ int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t *
 int journal_file_get_cutoff_monotonic_usec(JournalFile *f, sd_id128_t boot, usec_t *from, usec_t *to);
 
 bool journal_file_rotate_suggested(JournalFile *f);
+
+int journal_file_append_tag(JournalFile *f);
+
+int journal_file_verify(JournalFile *f, const char *key);