Upgrade to 2024 edition; MSRV 1.85 (#354)

Also includes clippy and rustfmt fixes so we're clean on Rust 1.85

Author: tarcieri

.github/workflows/ssh-cipher.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

.github/workflows/ssh-derive.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.61.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

.github/workflows/ssh-encoding.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -47,7 +47,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

.github/workflows/ssh-key.yml

@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -80,7 +80,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

.github/workflows/ssh-protocol.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

.github/workflows/workspace.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: 1.85.0
           components: clippy
       - run: cargo clippy --all-features
 

ssh-cipher/Cargo.toml

@@ -15,8 +15,8 @@ repository = "https://github.com/RustCrypto/SSH"
 categories = ["cryptography", "no-std"]
 keywords = ["crypto", "encryption", "openssh", "ssh"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 cipher = "=0.5.0-pre.6"

ssh-cipher/src/chacha20poly1305.rs

@@ -4,8 +4,8 @@ pub use chacha20::ChaCha20Legacy as ChaCha20;
 
 use crate::Tag;
 use aead::{
-    array::typenum::{U0, U16, U32, U8},
     AeadCore, Error, KeyInit, KeySizeUser, Result,
+    array::typenum::{U0, U8, U16, U32},
 };
 use cipher::{KeyIvInit, StreamCipher, StreamCipherSeek};
 use poly1305::Poly1305;

ssh-cipher/src/decryptor.rs

@@ -4,7 +4,7 @@ use crate::{Cipher, Error, Result};
 use cipher::KeyIvInit;
 
 #[cfg(feature = "aes-ctr")]
-use crate::{encryptor::ctr_encrypt as ctr_decrypt, Ctr128BE};
+use crate::{Ctr128BE, encryptor::ctr_encrypt as ctr_decrypt};
 
 #[cfg(feature = "tdes")]
 use des::TdesEde3;

ssh-cipher/src/encryptor.rs

@@ -6,7 +6,7 @@ use cipher::{Block, BlockCipher, BlockCipherEncrypt, KeyIvInit};
 #[cfg(feature = "aes-ctr")]
 use {
     crate::Ctr128BE,
-    cipher::{array::sizes::U16, StreamCipherCore},
+    cipher::{StreamCipherCore, array::sizes::U16},
 };
 
 #[cfg(feature = "tdes")]