typedef struct EntryItem EntryItem;
typedef struct HashItem HashItem;
-typedef struct FSPRGHeader FSPRGHeader;
+typedef struct FSSHeader FSSHeader;
/* Object types */
enum {
OBJECT_UNUSED,
- OBJECT_DATA,
+ OBJECT_DATA, /* !!! */
OBJECT_FIELD,
OBJECT_ENTRY,
OBJECT_DATA_HASH_TABLE,
OBJECT_FIELD_HASH_TABLE,
- OBJECT_ENTRY_ARRAY,
+ OBJECT_ENTRY_ARRAY, /* !!! */
OBJECT_TAG,
_OBJECT_TYPE_MAX
};
_packed_ struct TagObject {
ObjectHeader object;
uint64_t seqnum;
+ uint64_t epoch;
uint8_t tag[TAG_LENGTH]; /* SHA-256 HMAC */
};
};
enum {
- STATE_OFFLINE,
- STATE_ONLINE,
- STATE_ARCHIVED
+ STATE_OFFLINE = 0,
+ STATE_ONLINE = 1,
+ STATE_ARCHIVED = 2,
+ _STATE_MAX
};
/* Header flags */
};
enum {
- HEADER_COMPATIBLE_AUTHENTICATED = 1
+ HEADER_COMPATIBLE_SEALED = 1
};
#define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' })
le64_t n_fields;
/* Added in 189 */
le64_t n_tags;
+ le64_t n_entry_arrays;
+
+ /* Size: 224 */
};
-#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;
};