From 94701eec0951c608778c64e70bbdcc1ba67a5239 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Sun, 11 Apr 2021 11:21:30 +0200 Subject: [PATCH] vfs/cbe_trust_anchor: rename secured_superblock As the file formerly named 'secured_superblock' actually contains the hash of the superblock that was secured, it was renamed 'superblock_hash'. Ref #4032 --- repos/gems/run/vfs_cbe.run | 4 ++-- repos/gems/run/vfs_cbe_init.run | 2 +- repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repos/gems/run/vfs_cbe.run b/repos/gems/run/vfs_cbe.run index 50261706c5..2b608c805d 100644 --- a/repos/gems/run/vfs_cbe.run +++ b/repos/gems/run/vfs_cbe.run @@ -142,7 +142,7 @@ append config { - + @@ -333,7 +333,7 @@ append boot_modules { } append boot_modules { - encrypted_private_key secured_superblock + encrypted_private_key superblock_hash } append boot_modules [cbe_image_file] diff --git a/repos/gems/run/vfs_cbe_init.run b/repos/gems/run/vfs_cbe_init.run index 6ae282c7c0..e973a79431 100644 --- a/repos/gems/run/vfs_cbe_init.run +++ b/repos/gems/run/vfs_cbe_init.run @@ -173,4 +173,4 @@ build_boot_image $boot_modules run_genode_until {.*child "initialize_cbe" exited with exit value 0.*\n} 240 exec cp [run_dir]/genode/encrypted_private_key bin -exec cp [run_dir]/genode/secured_superblock bin +exec cp [run_dir]/genode/superblock_hash bin diff --git a/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc b/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc index bd82d45e32..9deaf20578 100644 --- a/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc +++ b/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc @@ -128,7 +128,7 @@ class Trust_anchor using Path = Genode::Path<256>; Path const key_file_name { "encrypted_private_key" }; - Path const hash_file_name { "secured_superblock" }; + Path const hash_file_name { "superblock_hash" }; struct Complete_request {