Bump all dependencies

Demi-Marie · Demi-Marie · commit 5c0992e582b9 · 2019-10-03T23:15:36.000-04:00
Includes the excellent work of @rschulman in libp2p#1265.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 asn1_der = "0.6.2"
 bs58 = "0.3.0"
 bytes = "0.4.12"
-ed25519-dalek = "0.9.1"
+ed25519-dalek = { git = "https://github.com/paritytech/ed25519-dalek" }
 failure = "0.1.5"
 fnv = "1.0.6"
 lazy_static = "1.4.0"
@@ -25,7 +25,7 @@ futures = "0.1.29"
 parking_lot = "0.9.0"
 protobuf = "2.8.1"
 quick-error = "1.2.2"
-rand = "0.6.5"
+rand = "0.7.2"
 rw-stream-sink = { version = "0.1.1", path = "../misc/rw-stream-sink" }
 libsecp256k1 = { version = "0.3.0", optional = true }
 sha2 = "0.8.0"
@@ -38,15 +38,15 @@ void = "1.0.2"
 zeroize = "0.10.1"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "unknown")))'.dependencies]
-ring = { version = "0.14", default-features = false }
+ring = { version = "0.16.9", features = ["alloc"], default-features = false }
 untrusted = "0.6.2"
 
 [dev-dependencies]
 libp2p-swarm = { version = "0.2.0", path = "../swarm" }
 libp2p-tcp = { version = "0.12.0", path = "../transports/tcp" }
 libp2p-mplex = { version = "0.12.0", path = "../muxers/mplex" }
 libp2p-secio = { version = "0.12.0", path = "../protocols/secio" }
-rand = "0.6.5"
+rand = "0.7.2"
 quickcheck = "0.9.0"
 tokio = "0.1.22"
 wasm-timer = "0.1"
diff --git a/core/src/identity/ed25519.rs b/core/src/identity/ed25519.rs
@@ -31,7 +31,7 @@ pub struct Keypair(ed25519::Keypair);
 impl Keypair {
     /// Generate a new Ed25519 keypair.
     pub fn generate() -> Keypair {
-        Keypair(ed25519::Keypair::generate::<sha2::Sha512, _>(&mut rand::thread_rng()))
+        Keypair(ed25519::Keypair::generate(&mut rand::thread_rng()))
     }
 
     /// Encode the keypair into a byte array by concatenating the bytes
@@ -51,7 +51,7 @@ impl Keypair {
 
     /// Sign a message using the private key of this keypair.
     pub fn sign(&self, msg: &[u8]) -> Vec<u8> {
-        self.0.sign::<sha2::Sha512>(msg).to_bytes().to_vec()
+        self.0.sign(msg).to_bytes().to_vec()
     }
 
     /// Get the public key of this keypair.
@@ -88,7 +88,7 @@ impl From<Keypair> for SecretKey {
 impl From<SecretKey> for Keypair {
     fn from(sk: SecretKey) -> Keypair {
         let secret = sk.0;
-        let public = ed25519::PublicKey::from(secret.expand::<sha2::Sha512>());
+        let public = ed25519::PublicKey::from(&secret);
         Keypair(ed25519::Keypair { secret, public })
     }
 }
@@ -100,7 +100,7 @@ pub struct PublicKey(ed25519::PublicKey);
 impl PublicKey {
     /// Verify the Ed25519 signature on a message using the public key.
     pub fn verify(&self, msg: &[u8], sig: &[u8]) -> bool {
-        ed25519::Signature::from_bytes(sig).and_then(|s| self.0.verify::<sha2::Sha512>(msg, &s)).is_ok()
+        ed25519::Signature::from_bytes(sig).and_then(|s| self.0.verify(msg, &s)).is_ok()
     }
 
     /// Encode the public key into a byte array in compressed form, i.e.
diff --git a/core/src/identity/rsa.rs b/core/src/identity/rsa.rs
@@ -27,7 +27,6 @@ use ring::rand::SystemRandom;
 use ring::signature::{self, RsaKeyPair, RSA_PKCS1_SHA256, RSA_PKCS1_2048_8192_SHA256};
 use ring::signature::KeyPair;
 use std::sync::Arc;
-use untrusted::Input;
 use zeroize::Zeroize;
 
 /// An RSA keypair.
@@ -40,7 +39,7 @@ impl Keypair {
     ///
     /// [RFC5208]: https://tools.ietf.org/html/rfc5208#section-5
     pub fn from_pkcs8(der: &mut [u8]) -> Result<Keypair, DecodingError> {
-        let kp = RsaKeyPair::from_pkcs8(Input::from(&der[..]))
+        let kp = RsaKeyPair::from_pkcs8(&der)
             .map_err(|e| DecodingError::new("RSA PKCS#8 PrivateKeyInfo").source(e))?;
         der.zeroize();
         Ok(Keypair(Arc::new(kp)))
@@ -69,10 +68,8 @@ pub struct PublicKey(Vec<u8>);
 impl PublicKey {
     /// Verify an RSA signature on a message using the public key.
     pub fn verify(&self, msg: &[u8], sig: &[u8]) -> bool {
-        signature::verify(&RSA_PKCS1_2048_8192_SHA256,
-                          Input::from(&self.0),
-                          Input::from(msg),
-                          Input::from(sig)).is_ok()
+        let key = signature::UnparsedPublicKey::new(&RSA_PKCS1_2048_8192_SHA256, &self.0);
+        key.verify(msg, sig).is_ok()
     }
 
     /// Encode the RSA public key in DER as a PKCS#1 RSAPublicKey structure,
diff --git a/misc/mdns/Cargo.toml b/misc/mdns/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-swarm = { version = "0.2.0", path = "../../swarm" }
 log = "0.4.8"
 multiaddr = { package = "parity-multiaddr", version = "0.5.0", path = "../multiaddr" }
 net2 = "0.2.33"
-rand = "0.6.5"
+rand = "0.7.2"
 smallvec = "0.6.10"
 tokio-io = "0.1.12"
 tokio-reactor = "0.1.10"
diff --git a/misc/multiaddr/Cargo.toml b/misc/multiaddr/Cargo.toml
@@ -25,5 +25,5 @@ bincode = "1.2.0"
 bs58 = "0.3.0"
 data-encoding = "2.1.2"
 quickcheck = "0.9.0"
-rand = "0.6.5"
+rand = "0.7.2"
 serde_json = "1.0.41"
diff --git a/misc/multihash/Cargo.toml b/misc/multihash/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/parity-multihash/"
 [dependencies]
 blake2 = { version = "0.8.1", default-features = false }
 bytes = "0.4.12"
-rand = { version = "0.6.5", default-features = false, features = ["std"] }
+rand = { version = "0.7.2", default-features = false, features = ["std"] }
 sha-1 = { version = "0.8.1", default-features = false }
 sha2 = { version = "0.8.0", default-features = false }
 sha3 = { version = "0.8.2", default-features = false }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
@@ -21,4 +21,4 @@ unsigned-varint = "0.2.2"
 tokio = "0.1.22"
 tokio-tcp = "0.1.3"
 quickcheck = "0.9.0"
-rand = "0.6.5"
+rand = "0.7.2"
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
@@ -18,6 +18,6 @@ futures = "0.1.29"
 libp2p-core = { version = "0.12.0", path = "../../core" }
 libp2p-swarm = { version = "0.2.0", path = "../../swarm" }
 protobuf = "2.8.1"
-rand = "0.6.5"
+rand = "0.7.2"
 smallvec = "0.6.10"
 tokio-io = "0.1.12"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -28,5 +28,5 @@ void = "1.0.2"
 libp2p-mplex = { version = "0.12.0", path = "../../muxers/mplex" }
 libp2p-secio = { version = "0.12.0", path = "../../protocols/secio" }
 libp2p-tcp = { version = "0.12.0", path = "../../transports/tcp" }
-rand = "0.6.5"
+rand = "0.7.2"
 tokio = "0.1.22"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-swarm = { version = "0.2.0", path = "../../swarm" }
 multiaddr = { package = "parity-multiaddr", version = "0.5.0", path = "../../misc/multiaddr" }
 multihash = { package = "parity-multihash", version = "0.1.0", path = "../../misc/multihash" }
 protobuf = "2.8.1"
-rand = "0.6.5"
+rand = "0.7.2"
 sha2 = "0.8.0"
 smallvec = "0.6.10"
 tokio-codec = "0.1.1"
@@ -36,5 +36,5 @@ libp2p-secio = { version = "0.12.0", path = "../secio" }
 libp2p-tcp = { version = "0.12.0", path = "../../transports/tcp" }
 libp2p-yamux = { version = "0.12.0", path = "../../muxers/yamux" }
 quickcheck = "0.9.0"
-rand = "0.6.5"
+rand = "0.7.2"
 tokio = "0.1.22"
diff --git a/protocols/noise/Cargo.toml b/protocols/noise/Cargo.toml
@@ -15,9 +15,9 @@ lazy_static = "1.4.0"
 libp2p-core = { version = "0.12.0", path = "../../core" }
 log = "0.4.8"
 protobuf = "2.8.1"
-rand = "0.6.5"
-ring = { version = "0.14", default-features = false }
-snow = { version = "0.5.2", features = ["ring-resolver"], default-features = false }
+rand = "0.7.2"
+ring = { version = "0.16.9", features = ["alloc"], default-features = false }
+snow = { version = "0.6.1", features = ["ring-resolver"], default-features = false }
 tokio-io = "0.1.12"
 x25519-dalek = "0.5.2"
 zeroize = "0.10.1"
diff --git a/protocols/noise/src/error.rs b/protocols/noise/src/error.rs
@@ -19,7 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use libp2p_core::identity;
-use snow::SnowError;
+use snow::error::Error as SnowError;
 use std::{error::Error, fmt, io};
 
 /// libp2p_noise error type.
diff --git a/protocols/noise/src/io.rs b/protocols/noise/src/io.rs
@@ -25,6 +25,7 @@ pub mod handshake;
 use futures::Poll;
 use log::{debug, trace};
 use snow;
+use snow::error::{StateProblem, Error as SnowError};
 use std::{fmt, io};
 use tokio_io::{AsyncRead, AsyncWrite};
 
@@ -55,12 +56,48 @@ impl Buffer {
     }
 }
 
+/// A passthrough enum for the two kinds of state machines in `snow`
+pub(crate) enum SnowState {
+    Transport(snow::TransportState),
+    Handshake(snow::HandshakeState)
+}
+
+impl SnowState {
+    pub fn read_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, SnowError> {
+        match self {
+            SnowState::Handshake(session) => session.read_message(message, payload),
+            SnowState::Transport(session) => session.read_message(message, payload),
+        }
+    }
+
+    pub fn write_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, SnowError> {
+        match self {
+            SnowState::Handshake(session) => session.write_message(message, payload),
+            SnowState::Transport(session) => session.write_message(message, payload),
+        }
+    }
+
+    pub fn get_remote_static(&self) -> Option<&[u8]> {
+        match self {
+            SnowState::Handshake(session) => session.get_remote_static(),
+            SnowState::Transport(session) => session.get_remote_static(),
+        }
+    }
+
+    pub fn into_transport_mode(self) -> Result<snow::TransportState, SnowError> {
+        match self {
+            SnowState::Handshake(session) => session.into_transport_mode(),
+            SnowState::Transport(_) => Err(SnowError::State(StateProblem::HandshakeAlreadyFinished)),
+        }
+    }
+}
+
 /// A noise session to a remote.
 ///
 /// `T` is the type of the underlying I/O resource.
 pub struct NoiseOutput<T> {
     io: T,
-    session: snow::Session,
+    session: SnowState,
     buffer: Buffer,
     read_state: ReadState,
     write_state: WriteState
@@ -76,9 +113,10 @@ impl<T> fmt::Debug for NoiseOutput<T> {
 }
 
 impl<T> NoiseOutput<T> {
-    fn new(io: T, session: snow::Session) -> Self {
+    fn new(io: T, session: SnowState) -> Self {
         NoiseOutput {
-            io, session,
+            io, 
+            session,
             buffer: Buffer { inner: Box::new([0; TOTAL_BUFFER_LEN]) },
             read_state: ReadState::Init,
             write_state: WriteState::Init
diff --git a/protocols/noise/src/io/handshake.rs b/protocols/noise/src/io/handshake.rs
@@ -26,6 +26,7 @@ mod payload;
 
 use crate::error::NoiseError;
 use crate::protocol::{Protocol, PublicKey, KeypairIdentity};
+use crate::io::SnowState;
 use libp2p_core::identity;
 use futures::{future, Async, Future, future::FutureResult, Poll};
 use std::{mem, io};
@@ -130,7 +131,7 @@ where
     /// ```
     pub fn rt1_initiator(
         io: T,
-        session: Result<snow::Session, NoiseError>,
+        session: Result<snow::HandshakeState, NoiseError>,
         identity: KeypairIdentity,
         identity_x: IdentityExchange
     ) -> Handshake<T, C> {
@@ -159,7 +160,7 @@ where
     /// ```
     pub fn rt1_responder(
         io: T,
-        session: Result<snow::Session, NoiseError>,
+        session: Result<snow::HandshakeState, NoiseError>,
         identity: KeypairIdentity,
         identity_x: IdentityExchange,
     ) -> Handshake<T, C> {
@@ -190,7 +191,7 @@ where
     /// ```
     pub fn rt15_initiator(
         io: T,
-        session: Result<snow::Session, NoiseError>,
+        session: Result<snow::HandshakeState, NoiseError>,
         identity: KeypairIdentity,
         identity_x: IdentityExchange
     ) -> Handshake<T, C> {
@@ -222,7 +223,7 @@ where
     /// ```
     pub fn rt15_responder(
         io: T,
-        session: Result<snow::Session, NoiseError>,
+        session: Result<snow::HandshakeState, NoiseError>,
         identity: KeypairIdentity,
         identity_x: IdentityExchange
     ) -> Handshake<T, C> {
@@ -291,7 +292,7 @@ impl<T> State<T> {
     /// Noise handshake pattern.
     fn new(
         io: T,
-        session: Result<snow::Session, NoiseError>,
+        session: Result<snow::HandshakeState, NoiseError>,
         identity: KeypairIdentity,
         identity_x: IdentityExchange
     ) -> FutureResult<Self, NoiseError> {
@@ -304,7 +305,7 @@ impl<T> State<T> {
         future::result(session.map(|s|
             State {
                 identity,
-                io: NoiseOutput::new(io, s),
+                io: NoiseOutput::new(io, SnowState::Handshake(s)),
                 dh_remote_pubkey_sig: None,
                 id_remote_pubkey,
                 send_identity
@@ -342,7 +343,7 @@ impl<T> State<T>
                         }
                     }
                 };
-                future::ok((remote, NoiseOutput { session: s, .. self.io }))
+                future::ok((remote, NoiseOutput { session: SnowState::Transport(s), .. self.io }))
             }
         }
     }
diff --git a/protocols/noise/src/protocol.rs b/protocols/noise/src/protocol.rs
@@ -24,7 +24,7 @@ pub mod x25519;
 
 use crate::NoiseError;
 use libp2p_core::identity;
-use rand::FromEntropy;
+use rand::SeedableRng;
 use zeroize::Zeroize;
 
 /// The parameters of a Noise protocol, consisting of a choice
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
@@ -16,7 +16,7 @@ libp2p-swarm = { version = "0.2.0", path = "../../swarm" }
 log = "0.4.8"
 multiaddr = { package = "parity-multiaddr", version = "0.5.0", path = "../../misc/multiaddr" }
 futures = "0.1.29"
-rand = "0.6.5"
+rand = "0.7.2"
 tokio-io = "0.1.12"
 wasm-timer = "0.1"
 void = "1.0.2"
diff --git a/protocols/secio/Cargo.toml b/protocols/secio/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.1.29"
 libp2p-core = { version = "0.12.0", path = "../../core" }
 log = "0.4.8"
 protobuf = "2.8.1"
-rand = "0.6.5"
+rand = "0.7.2"
 aes-ctr = "0.3.0"
 aesni = { version = "0.6.0", features = ["nocheck"], optional = true }
 twofish = "0.2.0"
@@ -28,7 +28,7 @@ sha2 = "0.8.0"
 hmac = "0.7.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ring = { version = "0.14", default-features = false }
+ring = { version = "0.16.9", features = ["alloc"], default-features = false }
 untrusted = "0.6.2"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/protocols/secio/src/exchange/impl_ring.rs b/protocols/secio/src/exchange/impl_ring.rs
@@ -25,7 +25,6 @@ use futures::{future, prelude::*};
 use log::debug;
 use ring::agreement as ring_agreement;
 use ring::rand as ring_rand;
-use untrusted::Input as UntrustedInput;
 
 impl Into<&'static ring_agreement::Algorithm> for KeyAgreement {
     #[inline]
@@ -64,8 +63,8 @@ pub fn generate_agreement(algorithm: KeyAgreement) -> impl Future<Item = (Agreem
 pub fn agree(algorithm: KeyAgreement, my_private_key: AgreementPrivateKey, other_public_key: &[u8], _out_size: usize)
     -> impl Future<Item = Vec<u8>, Error = SecioError>
 {
-    ring_agreement::agree_ephemeral(my_private_key, algorithm.into(),
-                                    UntrustedInput::from(other_public_key),
+    ring_agreement::agree_ephemeral(my_private_key,
+                                    &ring_agreement::UnparsedPublicKey::new(algorithm.into(), other_public_key),
                                     SecioError::SecretGenerationFailed,
                                     |key_material| Ok(key_material.to_vec()))
         .into_future()
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
@@ -20,5 +20,5 @@ void = "1.0.2"
 [dev-dependencies]
 libp2p-mplex = { version = "0.12.0", path = "../muxers/mplex" }
 quickcheck = "0.9.0"
-rand = "0.6.5"
+rand = "0.7.2"
 
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
diff --git a/transports/websocket/src/tls.rs b/transports/websocket/src/tls.rs

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ pub struct Keypair(ed25519::Keypair);`
`31`	`31`	`impl Keypair {`
`32`	`32`	`/// Generate a new Ed25519 keypair.`
`33`	`33`	`pub fn generate() -> Keypair {`
`34`		`- Keypair(ed25519::Keypair::generate::<sha2::Sha512, _>(&mut rand::thread_rng()))`
	`34`	`+ Keypair(ed25519::Keypair::generate(&mut rand::thread_rng()))`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/// Encode the keypair into a byte array by concatenating the bytes`
`@@ -51,7 +51,7 @@ impl Keypair {`
`51`	`51`
`52`	`52`	`/// Sign a message using the private key of this keypair.`
`53`	`53`	`pub fn sign(&self, msg: &[u8]) -> Vec<u8> {`
`54`		`- self.0.sign::<sha2::Sha512>(msg).to_bytes().to_vec()`
	`54`	`+ self.0.sign(msg).to_bytes().to_vec()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// Get the public key of this keypair.`
`@@ -88,7 +88,7 @@ impl From<Keypair> for SecretKey {`
`88`	`88`	`impl From<SecretKey> for Keypair {`
`89`	`89`	`fn from(sk: SecretKey) -> Keypair {`
`90`	`90`	`let secret = sk.0;`
`91`		`- let public = ed25519::PublicKey::from(secret.expand::<sha2::Sha512>());`
	`91`	`+ let public = ed25519::PublicKey::from(&secret);`
`92`	`92`	`Keypair(ed25519::Keypair { secret, public })`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ pub struct PublicKey(ed25519::PublicKey);`
`100`	`100`	`impl PublicKey {`
`101`	`101`	`/// Verify the Ed25519 signature on a message using the public key.`
`102`	`102`	`pub fn verify(&self, msg: &[u8], sig: &[u8]) -> bool {`
`103`		`- ed25519::Signature::from_bytes(sig).and_then(\|s\| self.0.verify::<sha2::Sha512>(msg, &s)).is_ok()`
	`103`	`+ ed25519::Signature::from_bytes(sig).and_then(\|s\| self.0.verify(msg, &s)).is_ok()`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/// Encode the public key into a byte array in compressed form, i.e.`