From 16a8673948e16abf31f2d281fc047dc3ac4a5e79 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 16 Apr 2024 04:51:10 +0700 Subject: [PATCH] Cleanup non-destructive warnings --- src/bin/ssh-keygen.rs | 2 +- src/connection.rs | 8 ++++---- src/error.rs | 24 ++++++++---------------- src/key_exchange/curve25519.rs | 2 +- src/message.rs | 4 ++-- src/packet.rs | 1 - src/public_key/ed25519.rs | 4 ++-- src/sys/unix.rs | 4 ---- 8 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/bin/ssh-keygen.rs b/src/bin/ssh-keygen.rs index d301d48..b1a09d3 100644 --- a/src/bin/ssh-keygen.rs +++ b/src/bin/ssh-keygen.rs @@ -6,5 +6,5 @@ use ssh::public_key; pub fn main() { let keypair = (public_key::ED25519.generate_key_pair)(None); let mut buffer = File::create("server.key").unwrap(); - keypair.export(&mut buffer); + let _ = keypair.export(&mut buffer); } diff --git a/src/connection.rs b/src/connection.rs index 12289ed..d049e91 100644 --- a/src/connection.rs +++ b/src/connection.rs @@ -60,7 +60,7 @@ impl<'a> Connection { } } - pub fn run(&mut self, mut stream: &mut S) -> Result<()> { + pub fn run(&mut self, stream: &mut S) -> Result<()> { self.send_id(stream)?; self.read_id(stream)?; @@ -334,7 +334,7 @@ impl<'a> Connection { if let Some(request) = request { - let mut channel = self.channels.get_mut(&channel_id).unwrap(); + let channel = self.channels.get_mut(&channel_id).unwrap(); channel.request(request); } else { @@ -356,7 +356,7 @@ impl<'a> Connection { let channel_id = reader.read_uint32()?; let data = reader.read_string()?; - let mut channel = self.channels.get_mut(&channel_id).unwrap(); + let channel = self.channels.get_mut(&channel_id).unwrap(); channel.data(data.as_slice())?; Ok(None) @@ -403,7 +403,7 @@ impl<'a> Connection { self.hash_data.client_kexinit = Some(packet.payload()); // Create a random 16 byte cookie - use rand::{self, Rng}; + use rand::Rng; let mut rng = rand::thread_rng(); let cookie: Vec = rng.gen_iter::().take(16).collect(); diff --git a/src/error.rs b/src/error.rs index 3f7f67a..228766f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,5 +1,3 @@ -use std::convert::From; -use std::error::Error; use std::fmt; use std::io; @@ -17,22 +15,16 @@ pub enum ConnectionError { impl fmt::Display for ConnectionError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "connection error: {}", (self as &Error).description()) - } -} - -impl Error for ConnectionError { - fn description(&self) -> &str { use self::ConnectionError::*; - match self + write!(f, "connection error: {}", (match &self { - &IoError(_) => "io error", - &ProtocolError => "protocol error", - &NegotiationError => "negotiation error", - &KeyExchangeError => "key exchange error", - &KeyGenerationError => "key generation error", - &IntegrityError => "integrity error", - } + IoError(err) => format!("io error: {}", err), + ProtocolError => "protocol error".to_owned(), + NegotiationError => "negotiation error".to_owned(), + KeyExchangeError => "key exchange error".to_owned(), + KeyGenerationError => "key generation error".to_owned(), + IntegrityError => "integrity error".to_owned(), + })) } } diff --git a/src/key_exchange/curve25519.rs b/src/key_exchange/curve25519.rs index 8b18d69..6ee0e0e 100644 --- a/src/key_exchange/curve25519.rs +++ b/src/key_exchange/curve25519.rs @@ -6,7 +6,7 @@ use key_exchange::{KexResult, KeyExchange}; use message::MessageType; use num_bigint::{BigInt, Sign}; use packet::{Packet, ReadPacketExt, WritePacketExt}; -use rand::{self, Rng}; +use rand::Rng; const ECDH_KEX_INIT: u8 = 30; const ECDH_KEX_REPLY: u8 = 31; diff --git a/src/message.rs b/src/message.rs index 21b4e97..aa5f9f1 100644 --- a/src/message.rs +++ b/src/message.rs @@ -44,12 +44,12 @@ impl From for MessageType { 6 => ServiceAccept, 20 => KexInit, 21 => NewKeys, - 30...49 => KeyExchange(id), + 30..=49 => KeyExchange(id), 50 => UserAuthRequest, 51 => UserAuthFailure, 52 => UserAuthSuccess, 53 => UserAuthBanner, - 60...79 => UserAuth(id), + 60..=79 => UserAuth(id), 80 => GlobalRequest, 81 => RequestSuccess, 82 => RequestFailure, diff --git a/src/packet.rs b/src/packet.rs index 6df3f68..dedff3c 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -1,7 +1,6 @@ use std::fmt; use std::io::{self, BufReader, Read, Result, Write}; use std::str::{self, FromStr}; -use std::string::ToString; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; diff --git a/src/public_key/ed25519.rs b/src/public_key/ed25519.rs index 4bacb08..1f27f2d 100644 --- a/src/public_key/ed25519.rs +++ b/src/public_key/ed25519.rs @@ -3,7 +3,7 @@ use std::io::ErrorKind::InvalidData; use crypto::ed25519; use public_key::{CryptoSystem, KeyPair}; -use rand::{self, Rng}; +use rand::Rng; pub static ED25519: CryptoSystem = CryptoSystem { id: "ed25519", @@ -26,7 +26,7 @@ impl Ed25519KeyPair { let (private, public) = ed25519::keypair(&seed); Box::new(Ed25519KeyPair { private: Some(private), - public: public, + public, }) } diff --git a/src/sys/unix.rs b/src/sys/unix.rs index 79b7946..f5d7797 100644 --- a/src/sys/unix.rs +++ b/src/sys/unix.rs @@ -3,7 +3,6 @@ use std::os::unix::io::RawFd; use std::path::PathBuf; pub fn before_exec() -> Result<()> { - use libc; unsafe { libc::setsid(); libc::ioctl(0, libc::TIOCSCTTY, 1); @@ -12,12 +11,10 @@ pub fn before_exec() -> Result<()> { } pub fn fork() -> usize { - use libc; unsafe { libc::fork() as usize } } pub fn set_winsize(fd: RawFd, row: u16, col: u16, xpixel: u16, ypixel: u16) { - use libc; unsafe { let size = libc::winsize { ws_row: row, @@ -30,7 +27,6 @@ pub fn set_winsize(fd: RawFd, row: u16, col: u16, xpixel: u16, ypixel: u16) { } pub fn getpty() -> (RawFd, PathBuf) { - use libc; use std::ffi::CStr; use std::fs::OpenOptions; use std::io::Error;