From baed47c3c20512507e497058d388782400a072f6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 17 Aug 2012 00:45:18 +0200 Subject: journal: rework terminology Let's clean up our terminology a bit. New terminology: FSS = Forward Secure Sealing FSPRG = Forward Secure Pseudo-Random Generator FSS is the combination of FSPRG and a HMAC. Sealing = process of adding authentication tags to the journal. Verification = process of checking authentication tags to the journal. Sealing Key = The key used for adding authentication tags to the journal. Verification Key = The key used for checking authentication tags of the journal. Key pair = The pair of Sealing Key and Verification Key Internally, the Sealing Key is the combination of the FSPRG State plus change interval/start time. Internally, the Verification Key is the combination of the FSPRG Seed plus change interval/start time. --- src/journal/journal-def.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/journal/journal-def.h') diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h index ab4988037c..52c55ab4bb 100644 --- a/src/journal/journal-def.h +++ b/src/journal/journal-def.h @@ -42,7 +42,7 @@ typedef struct TagObject TagObject; typedef struct EntryItem EntryItem; typedef struct HashItem HashItem; -typedef struct FSPRGHeader FSPRGHeader; +typedef struct FSSHeader FSSHeader; /* Object types */ enum { @@ -151,7 +151,7 @@ enum { }; enum { - HEADER_COMPATIBLE_AUTHENTICATED = 1 + HEADER_COMPATIBLE_SEALED = 1 }; #define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' }) @@ -189,18 +189,18 @@ _packed_ struct Header { le64_t n_entry_arrays; }; -#define FSPRG_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' }) +#define FSS_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' }) -_packed_ struct FSPRGHeader { +_packed_ struct FSSHeader { uint8_t signature[8]; /* "KSHHRHLP" */ le32_t compatible_flags; le32_t incompatible_flags; sd_id128_t machine_id; sd_id128_t boot_id; /* last writer */ le64_t header_size; - le64_t fsprg_start_usec; - le64_t fsprg_interval_usec; - le16_t secpar; + le64_t start_usec; + le64_t interval_usec; + le16_t fsprg_secpar; le16_t reserved[3]; - le64_t state_size; + le64_t fsprg_state_size; }; -- cgit v1.2.3-54-g00ecf