Revert "WIP"

This reverts commit 85f7e74.
openethereum · Jun 5, 2019 · 3c895da · 3c895da
1 parent 85f7e74
commit 3c895da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -143,4 +143,3 @@ members = [
 
 [patch.crates-io]
 heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }
-parity-crypto = { path = "../parity-common/parity-crypto" }
diff --git a/util/network-devp2p/src/connection.rs b/util/network-devp2p/src/connection.rs
@@ -21,10 +21,7 @@ use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::time::Duration;
 
 use bytes::{Buf, BufMut};
-use crypto::{
-	aes::{AesCtr256, AesEcb256},
-	ecdh::{self, Secret},
-};
+use crypto::aes::{AesCtr256, AesEcb256};
 use error_chain::bail;
 use ethereum_types::{H128, H256, H512};
 use keccak_hash::{keccak, write_keccak};
@@ -37,7 +34,7 @@ use rlp::{Rlp, RlpStream};
 use tiny_keccak::Keccak;
 
 use ethcore_io::{IoContext, StreamToken};
-//use ethkey::{crypto as ethcrypto, Secret};
+use ethkey::{crypto as ethcrypto, Secret};
 use network::{Error, ErrorKind};
 
 use crate::handshake::Handshake;
@@ -303,8 +300,7 @@ const NULL_IV : [u8; 16] = [0;16];
 impl EncryptedConnection {
 	/// Create an encrypted connection out of the handshake.
 	pub fn new(handshake: &mut Handshake) -> Result<EncryptedConnection, Error> {
-//		let shared = ethcrypto::ecdh::agree(handshake.ecdhe.secret(), &handshake.remote_ephemeral)?;
-		let shared = ecdh::agree(handshake.ecdhe.secret(), &handshake.remote_ephemeral)?;
+		let shared = ethcrypto::ecdh::agree(handshake.ecdhe.secret(), &handshake.remote_ephemeral)?;
 		let mut nonce_material = H512::default();
 		if handshake.originated {
 			(&mut nonce_material[0..32]).copy_from_slice(handshake.remote_nonce.as_bytes());