Skip to content

Commit f0510a0

Browse files
committed
fixup! Use KeyObfuscator in VssStore.
1 parent 483464f commit f0510a0

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/io/vss_store.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ pub struct VssStore {
4747
storable_builder: StorableBuilder<RandEntropySource>,
4848
key_obfuscator: KeyObfuscator,
4949
}
50+
51+
// Used to derive `data_encryption_key` from `vss_seed`, which is then used by the `StorableBuilder`.
5052
const DATA_ENCRYPTION_KEY_DERIVATION_INDEX: u32 = 1;
53+
54+
// Used to derive `obfuscation_master_key` from `vss_seed`, which is then used by the `KeyObfuscator`.
5155
const OBFUSCATION_KEY_DERIVATION_INDEX: u32 = 2;
5256

5357
impl VssStore {
@@ -56,7 +60,11 @@ impl VssStore {
5660
header_provider: Arc<dyn VssHeaderProvider>,
5761
) -> io::Result<Self> {
5862
let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
59-
let vss_master_xprv = Xpriv::new_master(Network::Bitcoin, &vss_seed).unwrap();
63+
// The selected bitcoin network doesn't matter here.
64+
let vss_master_xprv = Xpriv::new_master(Network::Bitcoin, &vss_seed).map_err(|e| {
65+
let msg = format!("Failed to create Vss master key, error: {}", e);
66+
io::Error::new(ErrorKind::Other, msg)
67+
})?;
6068
let data_encryption_key =
6169
derive_hardened_key(&vss_master_xprv, DATA_ENCRYPTION_KEY_DERIVATION_INDEX)?;
6270
let obfuscation_master_key =

0 commit comments

Comments
 (0)