Skip to content

Commit 6813559

Browse files
committed
accomodate change in nightly TryFrom
related: rust-lang/rust#40281
1 parent c0dc40a commit 6813559

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ impl Into<Session> for HandshakeState {
118118
}
119119

120120
impl TryFrom<HandshakeState> for TransportState {
121-
type Err = NoiseError;
121+
type Error = NoiseError;
122122

123-
fn try_from(old: HandshakeState) -> Result<Self, Self::Err> {
123+
fn try_from(old: HandshakeState) -> Result<Self, Self::Error> {
124124
let initiator = old.is_initiator();
125125
let cipherstates = old.finish()?;
126126
Ok(TransportState::new(cipherstates, initiator))

tests/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@ fn test_oversized_handshake_message() {
112112
assert!(h_i.write_message(&[0u8; 65530], &mut buffer_out).is_err());
113113
}
114114

115+
#[test]
116+
fn test_handshake_max_message_len() {
117+
let params: NoiseParams = "Noise_NN_25519_AESGCM_SHA256".parse().unwrap();
118+
let mut h_i = NoiseBuilder::new(params).build_initiator().unwrap();
119+
120+
let mut buffer_out = [0u8; 65535*2];
121+
assert!(h_i.write_message(&[0u8; 65530], &mut buffer_out).is_err());
122+
}
123+
115124
#[test]
116125
fn test_undersized_handshake_output_buffer() {
117126
let params: NoiseParams = "Noise_NN_25519_AESGCM_SHA256".parse().unwrap();

0 commit comments

Comments
 (0)