From 5280e6772732eb4841a749a3fea50c0705232177 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Jun 2012 20:45:54 +0200
Subject: [PATCH] journal: add basic object definition for signatures (cherry
picked from commit
8144056fa63291e5b25d91a48cd77b91e845eabf)
---
src/journal/journal-def.h | 18 ++++++++++++++++++
src/journal/journal-file.c | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index 2e13228..8d250b2 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -29,13 +29,17 @@
#include "macro.h"
typedef struct Header Header;
+
typedef struct ObjectHeader ObjectHeader;
typedef union Object Object;
+
typedef struct DataObject DataObject;
typedef struct FieldObject FieldObject;
typedef struct EntryObject EntryObject;
typedef struct HashTableObject HashTableObject;
typedef struct EntryArrayObject EntryArrayObject;
+typedef struct SignatureObject SignatureObject;
+
typedef struct EntryItem EntryItem;
typedef struct HashItem HashItem;
@@ -48,6 +52,7 @@ enum {
OBJECT_DATA_HASH_TABLE,
OBJECT_FIELD_HASH_TABLE,
OBJECT_ENTRY_ARRAY,
+ OBJECT_SIGNATURE,
_OBJECT_TYPE_MAX
};
@@ -115,6 +120,14 @@ _packed_ struct EntryArrayObject {
le64_t items[];
};
+#define SIGNATURE_LENGTH 160
+
+_packed_ struct SignatureObject {
+ ObjectHeader object;
+ le64_t from;
+ uint8_t signature[SIGNATURE_LENGTH];
+};
+
union Object {
ObjectHeader object;
DataObject data;
@@ -122,6 +135,7 @@ union Object {
EntryObject entry;
HashTableObject hash_table;
EntryArrayObject entry_array;
+ SignatureObject signature;
};
enum {
@@ -135,6 +149,10 @@ enum {
HEADER_INCOMPATIBLE_COMPRESSED = 1
};
+enum {
+ HEADER_COMPATIBLE_SIGNED = 1
+};
+
_packed_ struct Header {
uint8_t signature[8]; /* "LPKSHHRH" */
uint32_t compatible_flags;
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 1f1f81f..8002480 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1702,6 +1702,10 @@ void journal_file_dump(JournalFile *f) {
case OBJECT_ENTRY_ARRAY:
printf("Type: OBJECT_ENTRY_ARRAY\n");
break;
+
+ case OBJECT_SIGNATURE:
+ printf("Type: OBJECT_SIGNATURE\n");
+ break;
}
if (o->object.flags & OBJECT_COMPRESSED)