X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fchain%2Fkeysinterface.rs;h=53191faf2c9162e75db69661dec3aec483c76a50;hb=7a77c9f1d2297dc85dcf48aa898ae153440dbdc5;hp=18e22edc10deec235928f0005a1d6e6aeeb12acf;hpb=f904690b00ef04ca2763347ce53b1ee0c549b145;p=rust-lightning

diff --git a/src/chain/keysinterface.rs b/src/chain/keysinterface.rs
index 18e22edc..53191faf 100644
--- a/src/chain/keysinterface.rs
+++ b/src/chain/keysinterface.rs
@@ -6,16 +6,16 @@ use bitcoin::blockdata::transaction::{OutPoint, TxOut};
 use bitcoin::blockdata::script::{Script, Builder};
 use bitcoin::blockdata::opcodes;
 use bitcoin::network::constants::Network;
-use bitcoin::util::hash::Hash160;
 use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
 
+use bitcoin_hashes::{Hash, HashEngine};
+use bitcoin_hashes::sha256::Hash as Sha256;
+use bitcoin_hashes::hash160::Hash as Hash160;
+
 use secp256k1::key::{SecretKey, PublicKey};
 use secp256k1::Secp256k1;
 use secp256k1;
 
-use crypto::digest::Digest;
-
-use util::sha2::Sha256;
 use util::logger::Logger;
 use util::rng;
 use util::byte_utils;
@@ -116,7 +116,7 @@ impl_writeable!(ChannelKeys, 0, {
 /// Cooperative closes may use seed/2'
 /// The two close keys may be needed to claim on-chain funds!
 pub struct KeysManager {
-	secp_ctx: Secp256k1<secp256k1::All>,
+	secp_ctx: Secp256k1<secp256k1::SignOnly>,
 	node_secret: SecretKey,
 	destination_script: Script,
 	shutdown_pubkey: PublicKey,
@@ -132,15 +132,15 @@ impl KeysManager {
 	/// Constructs a KeysManager from a 32-byte seed. If the seed is in some way biased (eg your
 	/// RNG is busted) this may panic.
 	pub fn new(seed: &[u8; 32], network: Network, logger: Arc<Logger>) -> KeysManager {
-		let secp_ctx = Secp256k1::new();
-		match ExtendedPrivKey::new_master(&secp_ctx, network.clone(), seed) {
+		let secp_ctx = Secp256k1::signing_only();
+		match ExtendedPrivKey::new_master(network.clone(), seed) {
 			Ok(master_key) => {
 				let node_secret = master_key.ckd_priv(&secp_ctx, ChildNumber::from_hardened_idx(0)).expect("Your RNG is busted").secret_key;
 				let destination_script = match master_key.ckd_priv(&secp_ctx, ChildNumber::from_hardened_idx(1)) {
 					Ok(destination_key) => {
-						let pubkey_hash160 = Hash160::from_data(&ExtendedPubKey::from_private(&secp_ctx, &destination_key).public_key.serialize()[..]);
-						Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0)
-						              .push_slice(pubkey_hash160.as_bytes())
+						let pubkey_hash160 = Hash160::hash(&ExtendedPubKey::from_private(&secp_ctx, &destination_key).public_key.serialize()[..]);
+						Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0)
+						              .push_slice(&pubkey_hash160.into_inner())
 						              .into_script()
 					},
 					Err(_) => panic!("Your RNG is busted"),
@@ -187,7 +187,7 @@ impl KeysInterface for KeysManager {
 		// entropy, everything else just ensures uniqueness. We generally don't expect
 		// all clients to have non-broken RNGs here, so we also include the current
 		// time as a fallback to get uniqueness.
-		let mut sha = Sha256::new();
+		let mut sha = Sha256::engine();
 
 		let mut seed = [0u8; 32];
 		rng::fill_bytes(&mut seed[..]);
@@ -201,25 +201,21 @@ impl KeysInterface for KeysManager {
 		let child_privkey = self.channel_master_key.ckd_priv(&self.secp_ctx, ChildNumber::from_hardened_idx(child_ix as u32)).expect("Your RNG is busted");
 		sha.input(&child_privkey.secret_key[..]);
 
-		sha.result(&mut seed);
+		seed = Sha256::from_engine(sha).into_inner();
 
 		let commitment_seed = {
-			let mut sha = Sha256::new();
+			let mut sha = Sha256::engine();
 			sha.input(&seed);
 			sha.input(&b"commitment seed"[..]);
-			let mut res = [0; 32];
-			sha.result(&mut res);
-			res
+			Sha256::from_engine(sha).into_inner()
 		};
 		macro_rules! key_step {
 			($info: expr, $prev_key: expr) => {{
-				let mut sha = Sha256::new();
+				let mut sha = Sha256::engine();
 				sha.input(&seed);
 				sha.input(&$prev_key[..]);
 				sha.input(&$info[..]);
-				let mut res = [0; 32];
-				sha.result(&mut res);
-				SecretKey::from_slice(&self.secp_ctx, &res).expect("SHA-256 is busted")
+				SecretKey::from_slice(&Sha256::from_engine(sha).into_inner()).expect("SHA-256 is busted")
 			}}
 		}
 		let funding_key = key_step!(b"funding key", commitment_seed);
@@ -239,8 +235,7 @@ impl KeysInterface for KeysManager {
 	}
 
 	fn get_session_key(&self) -> SecretKey {
-		let mut sha = Sha256::new();
-		let mut res = [0u8; 32];
+		let mut sha = Sha256::engine();
 
 		let now = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time went backwards");
 		sha.input(&byte_utils::be32_to_array(now.subsec_nanos()));
@@ -249,7 +244,6 @@ impl KeysInterface for KeysManager {
 		let child_ix = self.session_child_index.fetch_add(1, Ordering::AcqRel);
 		let child_privkey = self.session_master_key.ckd_priv(&self.secp_ctx, ChildNumber::from_hardened_idx(child_ix as u32)).expect("Your RNG is busted");
 		sha.input(&child_privkey.secret_key[..]);
-		sha.result(&mut res);
-		SecretKey::from_slice(&self.secp_ctx, &res).expect("Your RNG is busted")
+		SecretKey::from_slice(&Sha256::from_engine(sha).into_inner()).expect("Your RNG is busted")
 	}
 }