fix(deps): Update MSRV to 1.85 and migrate to Edition 2024

Cargo.toml

@@ -11,9 +11,8 @@ readme = "README.md"
 repository = "https://github.com/RustCrypto/rustls-rustcrypto"
 categories = ["cryptography", "no-std"]
 keywords = ["rustls", "tls"]
-edition = "2021"
-rust-version = "1.75"
-resolver = "1" # Hack to enable the `custom` feature of `getrandom`
+edition = "2024"
+rust-version = "1.85"
 
 # Ensure all dependencies + feats are mapped to crate features for correct usage
 # default features often have std breaking no_std and potentially other unwanted

Makefile

@@ -12,4 +12,7 @@ fix:
 test:
 	cargo test
 
-.PHONY: check clean fix test
+cargo-update:
+	rustup run 1.85.0 cargo update
+
+.PHONY: check clean fix test cargo-update

src/aead/chacha20.rs

@@ -13,7 +13,7 @@ use rustls::crypto::cipher::{
 use rustls::{ConnectionTrafficSecrets, ContentType, ProtocolVersion};
 
 #[cfg(feature = "tls12")]
-use rustls::crypto::cipher::{KeyBlockShape, Tls12AeadAlgorithm, NONCE_LEN};
+use rustls::crypto::cipher::{KeyBlockShape, NONCE_LEN, Tls12AeadAlgorithm};
 
 pub struct Chacha20Poly1305;
 

src/lib.rs

@@ -13,7 +13,6 @@
     clippy::cast_precision_loss,
     clippy::cast_sign_loss,
     clippy::checked_conversions,
-    clippy::from_iter_instead_of_collect,
     clippy::missing_errors_doc,
     clippy::mod_module_files,
     clippy::implicit_saturating_sub,

src/quic.rs

@@ -7,7 +7,7 @@ use aead::{AeadCore, AeadInOut};
 use chacha20poly1305::{KeyInit, KeySizeUser};
 use crypto_common::typenum::Unsigned;
 use rustls::crypto::cipher::{self, AeadKey, Iv};
-use rustls::{quic, Error, Tls13CipherSuite};
+use rustls::{Error, Tls13CipherSuite, quic};
 
 #[allow(dead_code)] // TODO
 pub struct HeaderProtectionKey(AeadKey);

src/sign/rsa.rs

@@ -3,8 +3,8 @@ use alloc::{boxed::Box, format, string::ToString, sync::Arc};
 
 use pkcs8::DecodePrivateKey;
 use pki_types::PrivateKeyDer;
-use rsa::pkcs1::DecodeRsaPrivateKey;
 use rsa::RsaPrivateKey;
+use rsa::pkcs1::DecodeRsaPrivateKey;
 use rustls::sign::{Signer, SigningKey};
 use rustls::{SignatureAlgorithm, SignatureScheme};
 use sha2::{Sha256, Sha384, Sha512};

src/verify.rs

@@ -1,5 +1,5 @@
-use rustls::crypto::WebPkiSupportedAlgorithms;
 use rustls::SignatureScheme;
+use rustls::crypto::WebPkiSupportedAlgorithms;
 
 use self::ecdsa::{ECDSA_P256_SHA256, ECDSA_P256_SHA384, ECDSA_P384_SHA256, ECDSA_P384_SHA384};
 use self::eddsa::ED25519;

src/verify/ecdsa.rs

@@ -1,7 +1,7 @@
 use der::Decode;
 use digest::Digest;
 use paste::paste;
-use pki_types::{alg_id, AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
+use pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm, alg_id};
 use signature::hazmat::PrehashVerifier;
 
 macro_rules! impl_generic_ecdsa_verifer {

src/verify/eddsa.rs

@@ -1,4 +1,4 @@
-use pki_types::{alg_id, AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
+use pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm, alg_id};
 use signature::Verifier;
 
 #[derive(Debug)]

src/verify/rsa.rs

@@ -1,7 +1,7 @@
 use paste::paste;
-use pki_types::{alg_id, AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm};
+use pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm, alg_id};
 use rsa::pkcs1::DecodeRsaPublicKey;
-use rsa::{pkcs1v15, pss, RsaPublicKey};
+use rsa::{RsaPublicKey, pkcs1v15, pss};
 use sha2::{Sha256, Sha384, Sha512};
 use signature::Verifier;
 

tests/fake_cert_client_verifier.rs

@@ -3,9 +3,9 @@ use rustls::Error;
 
 use rustls::SignatureScheme;
 
+use rustls::DigitallySignedStruct;
 use rustls::pki_types::CertificateDer;
 use rustls::pki_types::UnixTime;
-use rustls::DigitallySignedStruct;
 
 use rustls::client::danger::HandshakeSignatureValid;
 use rustls::server::danger::ClientCertVerified;

tests/fake_cert_server_verifier.rs

@@ -1,12 +1,12 @@
+use rustls::DigitallySignedStruct;
+use rustls::Error;
+use rustls::SignatureScheme;
 use rustls::client::danger::HandshakeSignatureValid;
 use rustls::client::danger::ServerCertVerified;
 use rustls::client::danger::ServerCertVerifier;
 use rustls::pki_types::CertificateDer;
 use rustls::pki_types::ServerName;
 use rustls::pki_types::UnixTime;
-use rustls::DigitallySignedStruct;
-use rustls::Error;
-use rustls::SignatureScheme;
 
 #[derive(Debug)]
 pub struct FakeServerCertVerifier;