From a28ca441016fd6fd9bdac4871fcc4632592fee9f Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Sun, 11 Apr 2021 11:15:35 +0200 Subject: [PATCH] vfs/cbe_trust_anchor: rename keyfile As the file formerly named 'keyfile' actually contains the encrypted private key of the Trust Anchor, it was renamed 'encrypted_private_key'. 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 01a598620f..50261706c5 100644 --- a/repos/gems/run/vfs_cbe.run +++ b/repos/gems/run/vfs_cbe.run @@ -141,7 +141,7 @@ append config { - + @@ -333,7 +333,7 @@ append boot_modules { } append boot_modules { - keyfile secured_superblock + encrypted_private_key secured_superblock } 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 bb9070c5bf..6ae282c7c0 100644 --- a/repos/gems/run/vfs_cbe_init.run +++ b/repos/gems/run/vfs_cbe_init.run @@ -172,5 +172,5 @@ build_boot_image $boot_modules run_genode_until {.*child "initialize_cbe" exited with exit value 0.*\n} 240 -exec cp [run_dir]/genode/keyfile bin +exec cp [run_dir]/genode/encrypted_private_key bin exec cp [run_dir]/genode/secured_superblock 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 708166664d..bd82d45e32 100644 --- a/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc +++ b/repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc @@ -127,7 +127,7 @@ class Trust_anchor using Path = Genode::Path<256>; - Path const key_file_name { "keyfile" }; + Path const key_file_name { "encrypted_private_key" }; Path const hash_file_name { "secured_superblock" }; struct Complete_request