alee/relicario
1
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

refactor(cli): drop unused param from resolve_second_factor_secret (simplify pass)

Browse Source 
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01McMF5pUJbCMricmFEnf2sG
This commit is contained in:
adlee-was-taken
2026-06-26 00:19:55 -04:00
parent 2203d817ec
commit 110f02e4e3
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/relicario-cli/src/commands/recovery_qr.rs
View File

@@ -17,7 +17,7 @@ fn cmd_recovery_qr_generate() -> Result<()> {
let root = crate::helpers::vault_dir()?; let root = crate::helpers::vault_dir()?;
let pf = crate::session::read_params(&root)?; let pf = crate::session::read_params(&root)?;
let secret = crate::session::resolve_second_factor_secret(&root, pf.second_factor)?; let secret = crate::session::resolve_second_factor_secret(pf.second_factor)?;
let passphrase = if let Some(p) = crate::test_passphrase_override() { let passphrase = if let Some(p) = crate::test_passphrase_override() {
Zeroizing::new(p) Zeroizing::new(p)

4
crates/relicario-cli/src/session.rs
View File

@@ -36,7 +36,7 @@ impl UnlockedVault {
let pf = read_params(&root)?; let pf = read_params(&root)?;
let params = pf.to_kdf_params(); let params = pf.to_kdf_params();
let secret = resolve_second_factor_secret(&root, pf.second_factor)?; let secret = resolve_second_factor_secret(pf.second_factor)?;
let passphrase = if let Some(p) = crate::test_passphrase_override() { let passphrase = if let Some(p) = crate::test_passphrase_override() {
Zeroizing::new(p) Zeroizing::new(p)
@@ -210,10 +210,8 @@ pub fn get_keyfile_path() -> Result<PathBuf> {
/// Resolve the vault's 32-byte second-factor secret per the params hint: /// Resolve the vault's 32-byte second-factor secret per the params hint:
/// extract it from the reference image, or decode it from the key file. /// extract it from the reference image, or decode it from the key file.
pub(crate) fn resolve_second_factor_secret( pub(crate) fn resolve_second_factor_secret(
root: &Path,
second_factor: SecondFactor, second_factor: SecondFactor,
) -> Result<Zeroizing<[u8; 32]>> { ) -> Result<Zeroizing<[u8; 32]>> {
let _ = root; // retained in the API for future vault-relative resolution
match second_factor { match second_factor {
SecondFactor::Image => { SecondFactor::Image => {
let image_path = get_image_path()?; let image_path = get_image_path()?;