accomodate change in nightly TryFrom

related: rust-lang/rust#40281
mcginty · Mar 21, 2017 · 6813559 · 6813559
1 parent c0dc40a
commit 6813559
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/session.rs b/src/session.rs
@@ -118,9 +118,9 @@ impl Into<Session> for HandshakeState {
 }
 
 impl TryFrom<HandshakeState> for TransportState {
-    type Err = NoiseError;
+    type Error = NoiseError;
 
-    fn try_from(old: HandshakeState) -> Result<Self, Self::Err> {
+    fn try_from(old: HandshakeState) -> Result<Self, Self::Error> {
         let initiator = old.is_initiator();
         let cipherstates = old.finish()?;
         Ok(TransportState::new(cipherstates, initiator))

diff --git a/tests/lib.rs b/tests/lib.rs
@@ -112,6 +112,15 @@ fn test_oversized_handshake_message() {
     assert!(h_i.write_message(&[0u8; 65530], &mut buffer_out).is_err());
 }
 
+#[test]
+fn test_handshake_max_message_len() {
+    let params: NoiseParams = "Noise_NN_25519_AESGCM_SHA256".parse().unwrap();
+    let mut h_i = NoiseBuilder::new(params).build_initiator().unwrap();
+
+    let mut buffer_out = [0u8; 65535*2];
+    assert!(h_i.write_message(&[0u8; 65530], &mut buffer_out).is_err());
+}
+
 #[test]
 fn test_undersized_handshake_output_buffer() {
     let params: NoiseParams = "Noise_NN_25519_AESGCM_SHA256".parse().unwrap();