fixed #338 - make KeyPair::generate_ed25519 infallible

Eugeny · Sep 17, 2024 · cb8d9e9 · cb8d9e9
1 parent 73fa3e5
commit cb8d9e9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/russh-keys/src/key.rs b/russh-keys/src/key.rs
@@ -313,13 +313,13 @@ impl KeyPair {
     }
 
     /// Generate a ED25519 key pair.
-    pub fn generate_ed25519() -> Option<Self> {
+    pub fn generate_ed25519() -> Self {
         let keypair = ed25519_dalek::SigningKey::generate(&mut OsRng {});
         assert_eq!(
             keypair.verifying_key().as_bytes(),
             ed25519_dalek::VerifyingKey::from(&keypair).as_bytes()
         );
-        Some(KeyPair::Ed25519(keypair))
+        KeyPair::Ed25519(keypair)
     }
 
     /// Generate a RSA key pair.

diff --git a/russh/examples/echoserver.rs b/russh/examples/echoserver.rs
@@ -17,7 +17,7 @@ async fn main() {
         inactivity_timeout: Some(std::time::Duration::from_secs(3600)),
         auth_rejection_time: std::time::Duration::from_secs(3),
         auth_rejection_time_initial: Some(std::time::Duration::from_secs(0)),
-        keys: vec![russh_keys::key::KeyPair::generate_ed25519().unwrap()],
+        keys: vec![russh_keys::key::KeyPair::generate_ed25519()],
         ..Default::default()
     };
     let config = Arc::new(config);

diff --git a/russh/examples/ratatui_app.rs b/russh/examples/ratatui_app.rs
@@ -104,7 +104,7 @@ impl AppServer {
             inactivity_timeout: Some(std::time::Duration::from_secs(3600)),
             auth_rejection_time: std::time::Duration::from_secs(3),
             auth_rejection_time_initial: Some(std::time::Duration::from_secs(0)),
-            keys: vec![russh_keys::key::KeyPair::generate_ed25519().unwrap()],
+            keys: vec![russh_keys::key::KeyPair::generate_ed25519()],
             ..Default::default()
         };
 

diff --git a/russh/examples/ratatui_shared_app.rs b/russh/examples/ratatui_shared_app.rs
@@ -106,7 +106,7 @@ impl AppServer {
             inactivity_timeout: Some(std::time::Duration::from_secs(3600)),
             auth_rejection_time: std::time::Duration::from_secs(3),
             auth_rejection_time_initial: Some(std::time::Duration::from_secs(0)),
-            keys: vec![russh_keys::key::KeyPair::generate_ed25519().unwrap()],
+            keys: vec![russh_keys::key::KeyPair::generate_ed25519()],
             ..Default::default()
         };
 

diff --git a/russh/examples/sftp_server.rs b/russh/examples/sftp_server.rs
@@ -181,7 +181,7 @@ async fn main() {
     let config = russh::server::Config {
         auth_rejection_time: Duration::from_secs(3),
         auth_rejection_time_initial: Some(Duration::from_secs(0)),
-        keys: vec![KeyPair::generate_ed25519().unwrap()],
+        keys: vec![KeyPair::generate_ed25519()],
         ..Default::default()
     };
 

diff --git a/russh/examples/test.rs b/russh/examples/test.rs
@@ -14,7 +14,7 @@ async fn main() -> anyhow::Result<()> {
     config.auth_rejection_time = std::time::Duration::from_secs(3);
     config
         .keys
-        .push(russh_keys::key::KeyPair::generate_ed25519().unwrap());
+        .push(russh_keys::key::KeyPair::generate_ed25519());
     let config = Arc::new(config);
     let mut sh = Server {
         clients: Arc::new(Mutex::new(HashMap::new())),

diff --git a/russh/src/tests.rs b/russh/src/tests.rs
@@ -19,14 +19,14 @@ mod compress {
     async fn compress_local_test() {
         let _ = env_logger::try_init();
 
-        let client_key = russh_keys::key::KeyPair::generate_ed25519().unwrap();
+        let client_key = russh_keys::key::KeyPair::generate_ed25519();
         let mut config = server::Config::default();
         config.preferred = Preferred::COMPRESSED;
         config.inactivity_timeout = None; // Some(std::time::Duration::from_secs(3));
         config.auth_rejection_time = std::time::Duration::from_secs(3);
         config
             .keys
-            .push(russh_keys::key::KeyPair::generate_ed25519().unwrap());
+            .push(russh_keys::key::KeyPair::generate_ed25519());
         let config = Arc::new(config);
         let mut sh = Server {
             clients: Arc::new(Mutex::new(HashMap::new())),
@@ -162,20 +162,17 @@ mod channels {
 
         let _ = env_logger::try_init();
 
-        let client_key = russh_keys::key::KeyPair::generate_ed25519().unwrap();
+        let client_key = russh_keys::key::KeyPair::generate_ed25519();
         let mut config = server::Config::default();
         config.inactivity_timeout = None;
         config.auth_rejection_time = std::time::Duration::from_secs(3);
         config
             .keys
-            .push(russh_keys::key::KeyPair::generate_ed25519().unwrap());
+            .push(russh_keys::key::KeyPair::generate_ed25519());
         let config = Arc::new(config);
         let socket = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
         let addr = socket.local_addr().unwrap();
 
-        #[derive(Clone)]
-        struct Server {}
-
         let server_join = tokio::spawn(async move {
             let (socket, _) = socket.accept().await.unwrap();
 

diff --git a/russh/tests/test_data_stream.rs b/russh/tests/test_data_stream.rs
@@ -30,7 +30,7 @@ async fn test_reader_and_writer() -> Result<(), anyhow::Error> {
 
 async fn stream(addr: SocketAddr, data: &[u8]) -> Result<(), anyhow::Error> {
     let config = Arc::new(client::Config::default());
-    let key = Arc::new(russh_keys::key::KeyPair::generate_ed25519().unwrap());
+    let key = Arc::new(russh_keys::key::KeyPair::generate_ed25519());
 
     let mut session = russh::client::connect(config, addr, Client).await?;
     let mut channel = match session.authenticate_publickey("user", key).await {
@@ -84,7 +84,7 @@ struct Server;
 impl Server {
     async fn run(addr: SocketAddr) {
         let config = Arc::new(server::Config {
-            keys: vec![russh_keys::key::KeyPair::generate_ed25519().unwrap()],
+            keys: vec![russh_keys::key::KeyPair::generate_ed25519()],
             window_size: WINDOW_SIZE,
             ..Default::default()
         });