fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-28 10:11:19 +00:00
Code Issues Projects Releases Wiki Activity

protocols/noise: Adapt to breaking changes in noise 0.16 (#1292)

Browse Source
This commit is contained in:
Max Inden 2019-11-01 17:34:50 +01:00 committed by Pierre Krieger
parent 8944899fe0
commit 5f17b11f8e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocols/noise/src/io.rs
View File

@ -62,14 +62,14 @@ pub(crate) enum SnowState {
}
impl SnowState {
pub fn read_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, SnowError> {
pub fn read_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, snow::Error> {
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> {
pub fn write_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, snow::Error> {
match self {
SnowState::Handshake(session) => session.write_message(message, payload),
SnowState::Transport(session) => session.write_message(message, payload),
@ -83,10 +83,10 @@ impl SnowState {
}
}
pub fn into_transport_mode(self) -> Result<snow::TransportState, SnowError> {
pub fn into_transport_mode(self) -> Result<snow::TransportState, snow::Error> {
match self {
SnowState::Handshake(session) => session.into_transport_mode(),
SnowState::Transport(_) => Err(SnowError::State(StateProblem::HandshakeAlreadyFinished)),
SnowState::Transport(_) => Err(snow::Error::State(snow::error::StateProblem::HandshakeAlreadyFinished)),
}
}
}

12
protocols/noise/src/io/handshake.rs
View File

@ -122,7 +122,7 @@ impl<T, C> Future for Handshake<T, C> {
/// ```
pub fn rt1_initiator<T, C>(
io: T,
session: Result<snow::Session, NoiseError>,
session: Result<snow::HandshakeState, NoiseError>,
identity: KeypairIdentity,
identity_x: IdentityExchange
) -> Handshake<T, C>
@ -156,7 +156,7 @@ where
/// ```
pub fn rt1_responder<T, C>(
io: T,
session: Result<snow::Session, NoiseError>,
session: Result<snow::HandshakeState, NoiseError>,
identity: KeypairIdentity,
identity_x: IdentityExchange,
) -> Handshake<T, C>
@ -192,7 +192,7 @@ where
/// ```
pub fn rt15_initiator<T, C>(
io: T,
session: Result<snow::Session, NoiseError>,
session: Result<snow::HandshakeState, NoiseError>,
identity: KeypairIdentity,
identity_x: IdentityExchange
) -> Handshake<T, C>
@ -229,7 +229,7 @@ where
/// ```
pub fn rt15_responder<T, C>(
io: T,
session: Result<snow::Session, NoiseError>,
session: Result<snow::HandshakeState, NoiseError>,
identity: KeypairIdentity,
identity_x: IdentityExchange
) -> Handshake<T, C>
@ -363,7 +363,7 @@ where
let mut payload_buf = vec![0; len];
state.io.read_exact(&mut payload_buf).await?;
let pb: payload::Identity = protobuf::parse_from_bytes(&payload_buf)?;
let pb: payload_proto::Identity = protobuf::parse_from_bytes(&payload_buf)?;
if !pb.pubkey.is_empty() {
let pk = identity::PublicKey::from_protobuf_encoding(pb.get_pubkey())
@ -387,7 +387,7 @@ async fn send_identity<T>(state: &mut State<T>) -> Result<(), NoiseError>
where
T: AsyncWrite + Unpin,
{
let mut pb = payload::Identity::new();
let mut pb = payload_proto::Identity::new();
if state.send_identity {
pb.set_pubkey(state.identity.public.clone().into_protobuf_encoding());
}