test fixes

README.md

@@ -4,13 +4,19 @@ A full implementation of the SSH 2 protocol, both server-side and client-side.
 
 Thrussh is completely asynchronous, and can be combined with other protocols using [Tokio](//tokio.rs).
 
-## Panics
+## Safety
 
-`deny(clippy::panic)` except for:
+* `deny(clippy::unwrap_used)`
+* `deny(clippy::expect_used)`
+* `deny(clippy::indexing_slicing)`
+* `deny(clippy::panic)`
+* Exceptions are checked manually
+
+### Panics
 
 * When the Rust allocator fails to allocate memory during a CryptoVec being resized.
 
-## Unsafe code
+### Unsafe code
 
 * `cryptovec` uses `unsafe` for faster copying, initialization and binding to native API.
 * `russh-libsodium` uses `unsafe` for `libsodium` bindings.

cryptovec/src/lib.rs

@@ -403,7 +403,7 @@ impl CryptoVec {
     /// Create a `CryptoVec` from a slice
     ///
     /// ```
-    /// CryptoVec::from_slice(b"test");
+    /// russh_cryptovec::CryptoVec::from_slice(b"test");
     /// ```
     pub fn from_slice(s: &[u8]) -> CryptoVec {
         let mut v = CryptoVec::new();

files/id_ed25519.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2pr+Bfus1hvPof4Wb/plZCzSbqadHH0u+/f4ODtKnE [email protected]

thrussh-keys/src/lib.rs

@@ -148,7 +148,7 @@ const KEYTYPE_RSA: &[u8] = b"ssh-rsa";
 /// Load a public key from a file. Ed25519 and RSA keys are supported.
 ///
 /// ```
-/// thrussh_keys::load_public_key("/home/pe/.ssh/id_ed25519.pub").unwrap();
+/// thrussh_keys::load_public_key("../files/id_ed25519.pub").unwrap();
 /// ```
 pub fn load_public_key<P: AsRef<Path>>(path: P) -> Result<key::PublicKey, Error> {
     let mut pubkey = String::new();

thrussh/src/lib.rs

@@ -671,7 +671,6 @@ mod test_compress {
         let _ = env_logger::try_init();
 
         let client_key = thrussh_keys::key::KeyPair::generate_ed25519().unwrap();
-        let client_pubkey = Arc::new(client_key.clone_public_key());
         let mut config = server::Config::default();
         config.preferred = Preferred::COMPRESSED;
         config.connection_timeout = None; // Some(std::time::Duration::from_secs(3));
@@ -681,7 +680,6 @@ mod test_compress {
             .push(thrussh_keys::key::KeyPair::generate_ed25519().unwrap());
         let config = Arc::new(config);
         let mut sh = Server {
-            client_pubkey,
             clients: Arc::new(Mutex::new(HashMap::new())),
             id: 0,
         };
@@ -721,7 +719,6 @@ mod test_compress {
 
     #[derive(Clone)]
     struct Server {
-        client_pubkey: Arc<thrussh_keys::key::PublicKey>,
         clients: Arc<Mutex<HashMap<(usize, ChannelId), super::server::Handle>>>,
         id: usize,
     }