Upgrade to 2024 edition; MSRV 1.85

tarcieri · tarcieri · commit db03685d4c17 · 2025-04-19T09:12:50.000-06:00
Also includes clippy fixes so we're clean on Rust 1.85
diff --git a/.github/workflows/ssh-cipher.yml b/.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
diff --git a/.github/workflows/ssh-derive.yml b/.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
diff --git a/.github/workflows/ssh-encoding.yml b/.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
diff --git a/.github/workflows/ssh-key.yml b/.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
diff --git a/.github/workflows/ssh-protocol.yml b/.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
diff --git a/.github/workflows/workspace.yml b/.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
 
diff --git a/ssh-cipher/Cargo.toml b/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"
diff --git a/ssh-derive/Cargo.toml b/ssh-derive/Cargo.toml
@@ -9,8 +9,8 @@ repository = "https://github.com/RustCrypto/SSH"
 categories = ["authentication", "cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "certificate", "key", "openssh", "ssh"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.61"
+edition = "2024"
+rust-version = "1.85"
 
 [lib]
 proc-macro = true
diff --git a/ssh-encoding/Cargo.toml b/ssh-encoding/Cargo.toml
@@ -12,8 +12,8 @@ repository = "https://github.com/RustCrypto/SSH"
 categories = ["authentication", "cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "certificate", "key", "openssh", "ssh"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 base64ct = { version = "1.7", optional = true }
diff --git a/ssh-encoding/src/pem/decode.rs b/ssh-encoding/src/pem/decode.rs
@@ -13,7 +13,7 @@ pub trait DecodePem: Decode + PemLabel + Sized {
 
 impl<T: Decode + PemLabel + Sized> DecodePem for T {
     fn decode_pem(pem: impl AsRef<[u8]>) -> Result<Self, Self::Error> {
-        let mut reader = PemReader::new(pem.as_ref()).map_err(crate::Error::from)?;
+        let mut reader = PemReader::new(pem.as_ref())?;
         Self::validate_pem_label(reader.type_label()).map_err(crate::Error::from)?;
 
         let ret = Self::decode(&mut reader)?;
diff --git a/ssh-encoding/src/pem/encode.rs b/ssh-encoding/src/pem/encode.rs
@@ -22,10 +22,10 @@ pub trait EncodePem: Encode + PemLabel {
 
 impl<T: Encode + PemLabel> EncodePem for T {
     fn encode_pem<'o>(&self, line_ending: LineEnding, out: &'o mut [u8]) -> Result<&'o str, Error> {
-        let mut writer = PemWriter::new(Self::PEM_LABEL, line_ending, out).map_err(Error::from)?;
+        let mut writer = PemWriter::new(Self::PEM_LABEL, line_ending, out)?;
         self.encode(&mut writer)?;
 
-        let encoded_len = writer.finish().map_err(Error::from)?;
+        let encoded_len = writer.finish()?;
         str::from_utf8(&out[..encoded_len]).map_err(Error::from)
     }
 
diff --git a/ssh-encoding/src/pem/writer.rs b/ssh-encoding/src/pem/writer.rs
@@ -33,7 +33,7 @@ impl<'o> PemWriter<'o> {
     }
 }
 
-impl<'o> Writer for PemWriter<'o> {
+impl Writer for PemWriter<'_> {
     fn write(&mut self, bytes: &[u8]) -> Result<()> {
         Ok(self.inner.encode(bytes)?)
     }
diff --git a/ssh-encoding/tests/decode.rs b/ssh-encoding/tests/decode.rs
@@ -14,12 +14,12 @@ fn decode_u8() {
 fn decode_boolean() {
     let mut bytes = hex!("01").as_slice();
     let ret = bool::decode(&mut bytes).unwrap();
-    assert_eq!(ret, true);
+    assert!(ret);
 
     // "All non-zero values MUST be interpreted as TRUE"
     let mut bytes = hex!("FF").as_slice();
     let ret = bool::decode(&mut bytes).unwrap();
-    assert_eq!(ret, true);
+    assert!(ret);
 }
 
 #[test]
diff --git a/ssh-key/Cargo.toml b/ssh-key/Cargo.toml
@@ -14,8 +14,8 @@ repository = "https://github.com/RustCrypto/SSH"
 categories = ["authentication", "cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "certificate", "openssh", "ssh", "sshsig"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 cipher = { package = "ssh-cipher", version = "=0.3.0-pre.2", features = ["zeroize"], path = "../ssh-cipher" }
diff --git a/ssh-key/src/certificate/options_map.rs b/ssh-key/src/certificate/options_map.rs
@@ -81,9 +81,7 @@ impl Encode for OptionsMap {
                     },
                 ]
                 .checked_sum()
-            })
-            .map_err(Into::into)
-    }
+            })}
 
     fn encode(&self, writer: &mut impl Writer) -> encoding::Result<()> {
         self.encoded_len()?
diff --git a/ssh-key/src/ppk.rs b/ssh-key/src/ppk.rs
@@ -116,11 +116,11 @@ impl Cipher {
                     hash.update(password.as_bytes());
                     hash.finalize().to_vec()
                 };
-                hashes.extend_from_slice({
+                hashes.extend_from_slice(&{
                     let mut hash = Sha1::default();
                     hash.update([0, 0, 0, 1]);
                     hash.update(password.as_bytes());
-                    hash.finalize().as_slice()
+                    hash.finalize()
                 });
 
                 #[allow(clippy::unwrap_used)] // known size
diff --git a/ssh-key/src/sshsig.rs b/ssh-key/src/sshsig.rs
@@ -205,7 +205,6 @@ impl SshSig {
     }
 
     /// Get the hash algorithm used to produce this signature.
-
     ///
     /// Data to be signed is first hashed with the specified `hash_alg`.
     /// This is done to limit the amount of data presented to the signature
@@ -321,7 +320,7 @@ struct SignedData<'a> {
     hash: &'a [u8],
 }
 
-impl<'a> SignedData<'a> {
+impl SignedData<'_> {
     fn to_bytes(self) -> Result<Vec<u8>> {
         let mut signed_bytes = Vec::with_capacity(self.encoded_len()?);
         self.encode(&mut signed_bytes)?;
diff --git a/ssh-key/tests/algorithm_name.rs b/ssh-key/tests/algorithm_name.rs
@@ -40,15 +40,15 @@ fn invalid_algorithm_name() {
 
     for name in INVALID_NAMES {
         assert!(
-            AlgorithmName::from_str(&name).is_err(),
+            AlgorithmName::from_str(name).is_err(),
             "{:?} should be an invalid algorithm name",
             name
         );
     }
 
     for name in INVALID_CERT_STRS {
         assert!(
-            AlgorithmName::from_certificate_type(&name).is_err(),
+            AlgorithmName::from_certificate_type(name).is_err(),
             "{:?} should be an invalid certificate str",
             name
         );
diff --git a/ssh-key/tests/public_key.rs b/ssh-key/tests/public_key.rs
@@ -313,7 +313,7 @@ fn new_sk_ecdsa_p256() {
         0x9e, 0xcd, 0x8d, 0x93, 0x1e,
     ];
 
-    let ec_point = sec1::EncodedPoint::<U32>::from_bytes(&EXAMPLE_EC_POINT).unwrap();
+    let ec_point = sec1::EncodedPoint::<U32>::from_bytes(EXAMPLE_EC_POINT).unwrap();
     let sk_key = SkEcdsaSha2NistP256::new(ec_point, "ssh:".to_string());
     let key = PublicKey::from_openssh(OPENSSH_SK_ECDSA_P256_EXAMPLE).unwrap();
 
@@ -346,13 +346,11 @@ fn decode_sk_ed25519_openssh() {
 #[cfg(feature = "alloc")]
 #[test]
 fn new_sk_ed25519_openssh() {
-    const EXAMPLE_PUBKEY: Ed25519PublicKey = Ed25519PublicKey {
-        0: [
+    const EXAMPLE_PUBKEY: Ed25519PublicKey = Ed25519PublicKey([
             0x21, 0x68, 0xfe, 0x4e, 0x4b, 0x53, 0xcf, 0x3a, 0xde, 0xee, 0xba, 0x60, 0x2f, 0x5e,
             0x50, 0xed, 0xb5, 0xef, 0x44, 0x1d, 0xba, 0x88, 0x4f, 0x51, 0x19, 0x10, 0x9d, 0xb2,
             0xda, 0xfd, 0xd7, 0x33,
-        ],
-    };
+        ]);
 
     let sk_key = SkEd25519::new(EXAMPLE_PUBKEY, "ssh:".to_string());
     let key = PublicKey::from_openssh(OPENSSH_SK_ED25519_EXAMPLE).unwrap();
@@ -436,7 +434,7 @@ fn encode_rsa_4096_openssh() {
 fn public_keys_are_hashable() {
     let key = PublicKey::from_openssh(OPENSSH_ED25519_EXAMPLE).unwrap();
     let set = HashSet::from([&key]);
-    assert_eq!(true, set.contains(&key));
+    assert!(set.contains(&key));
 }
 
 #[cfg(feature = "std")]
diff --git a/ssh-protocol/Cargo.toml b/ssh-protocol/Cargo.toml
@@ -12,8 +12,8 @@ repository = "https://github.com/RustCrypto/SSH"
 categories = ["authentication", "cryptography", "encoding", "no-std"]
 keywords = ["crypto", "certificate", "openssh", "ssh", "sshsig"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 cipher = { package = "ssh-cipher", version = "=0.3.0-pre.2", default-features = false, path = "../ssh-cipher" }
