zecfoundation
/
rust-bitcoin
mirror of https://github.com/ZcashFoundation/rust-bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for upstream

This commit is contained in:
Andrew Poelstra 2014-08-28 11:13:33 -07:00
parent 94cecfbd60
commit 38f8132067
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/patricia_tree.rs
View File

@ -411,7 +411,7 @@ impl<D:SimpleDecoder<E>, E, K:ConsensusDecodable<D, E>, V:ConsensusDecodable<D,
}
/// Iterator
pub struct Items<'tree, K, V> {
pub struct Items<'tree, K: 'tree, V: 'tree> {
started: bool,
node: Option<&'tree PatriciaTree<K, V>>,
parents: Vec<&'tree PatriciaTree<K, V>>

7
src/wallet/bip32.rs
View File

@ -126,8 +126,8 @@ impl ExtendedPrivKey {
if n >= (1 << 31) { return Err(InvalidChildNumber(i)) }
// Non-hardened key: compute public data and use that
secp256k1::init();
// Unsafety just because I have to call the init() function
hmac.input(unsafe { PublicKey::from_secret_key(&self.secret_key, true).as_slice() });
// Note the unwrap: this is fine, we checked the SK when we created it
hmac.input(PublicKey::from_secret_key(&self.secret_key, true).as_slice());
u64_to_be_bytes(n as u64, 4, |raw| hmac.input(raw));
}
Hardened(n) => {
@ -185,8 +185,7 @@ impl ExtendedPubKey {
depth: sk.depth,
parent_fingerprint: sk.parent_fingerprint,
child_number: sk.child_number,
// Unsafety because we needed to run `init` above first
public_key: unsafe { PublicKey::from_secret_key(&sk.secret_key, true) },
public_key: PublicKey::from_secret_key(&sk.secret_key, true),
chain_code: sk.chain_code
}
}