fixed #500 - Including TTY_OP_END in terminal_modes triggers ‘Packet integrity error’ due to duplicate sentinel

Author: Eugeny

russh/src/client/session.rs

@@ -128,11 +128,13 @@ impl Session {
 
                     ((1 + 5 * terminal_modes.len()) as u32).encode(&mut enc.write)?;
                     for &(code, value) in terminal_modes {
+                        if code == Pty::TTY_OP_END {
+                            continue;
+                        }
                         (code as u8).encode(&mut enc.write)?;
                         value.encode(&mut enc.write)?;
                     }
-                    // 0 code (to terminate the list)
-                    0u8.encode(&mut enc.write)?;
+                    (Pty::TTY_OP_END as u8).encode(&mut enc.write)?;
                 });
             }
         }

russh/src/keys/format/mod.rs

@@ -144,8 +144,9 @@ pub fn encode_pkcs8_pem_encrypted<W: Write>(
 
 #[cfg(feature = "rsa")]
 fn decode_rsa_pkcs1_der(secret: &[u8]) -> Result<ssh_key::private::RsaKeypair, Error> {
-    use pkcs1::DecodeRsaPrivateKey;
     use std::convert::TryInto;
 
+    use pkcs1::DecodeRsaPrivateKey;
+
     Ok(rsa::RsaPrivateKey::from_pkcs1_der(secret)?.try_into()?)
 }

russh/src/session.rs

@@ -134,7 +134,8 @@ impl<C> CommonSession<C> {
             self.strict_kex = self.strict_kex || newkeys.names.strict_kex;
 
             // Reset compression state
-            enc.client_compression.init_compress(self.packet_writer.compress());
+            enc.client_compression
+                .init_compress(self.packet_writer.compress());
             enc.server_compression.init_decompress(&mut enc.decompress);
         }
     }