alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename sb to block_device

Browse Source 
Signed-off-by: Roland Vet <RlndVt@protonmail.com>
This commit is contained in:
Roland Vet 2024-02-20 20:51:31 +01:00
parent ceb9eaa020
commit eaf5575080
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/key.rs
View File

@ -150,22 +150,22 @@ fn decrypt_master_key(sb: &bch_sb_handle, pass: String) -> anyhow::Result<()> {
} }
} }
pub fn read_from_key_file(sb: &bch_sb_handle, key_file: &std::path::Path) -> anyhow::Result<()> { pub fn read_from_key_file(block_device: &bch_sb_handle, key_file: &std::path::Path) -> anyhow::Result<()> {
// Attempts to decrypt the master key by key_file // Attempts to decrypt the master key by key_file
// Return true if decryption was successful, false otherwise // Return true if decryption was successful, false otherwise
info!("Attempting to decrypt master key for filesystem {}, using key file {}", sb.sb().uuid(), key_file.display()); info!("Attempting to decrypt master key for filesystem {}, using key file {}", block_device.sb().uuid(), key_file.display());
// Read the contents of the key file into a string // Read the contents of the key file into a string
let pass = fs::read_to_string(key_file)?; let pass = fs::read_to_string(key_file)?;
// Call decrypt_master_key with the read string // Call decrypt_master_key with the read string
decrypt_master_key(sb, pass) decrypt_master_key(block_device, pass)
} }
pub fn prepare_key(sb: &bch_sb_handle, password_policy: KeyPolicy) -> anyhow::Result<()> { pub fn prepare_key(block_device: &bch_sb_handle, password_policy: KeyPolicy) -> anyhow::Result<()> {
info!("Attempting to decrypt master key for filesystem {}, using key policy {}", sb.sb().uuid(), password_policy); info!("Attempting to decrypt master key for filesystem {}, using key policy {}", block_device.sb().uuid(), password_policy);
match password_policy { match password_policy {
KeyPolicy::Fail => Err(anyhow!("no key available")), KeyPolicy::Fail => Err(anyhow!("no key available")),
KeyPolicy::Wait => Ok(wait_for_key(&sb.sb().uuid())?), KeyPolicy::Wait => Ok(wait_for_key(&block_device.sb().uuid())?),
KeyPolicy::Ask => ask_for_key(sb), KeyPolicy::Ask => ask_for_key(block_device),
_ => Err(anyhow!("no keyoption specified for locked filesystem")), _ => Err(anyhow!("no keyoption specified for locked filesystem")),
} }
} }