From c2b1bd3ec5d233a2fc9382e85065f10903663624 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Mon, 2 Nov 2026 10:33:41 -0700 Subject: [PATCH] Bump edition to 2024; apply rustfmt Apparently despite saying it did, #478 didn't actually bump the edition. This bumps the edition and applies the resulting rustfmt changes. --- Cargo.toml | 2 +- src/algorithms/generate.rs | 3 ++- src/algorithms/pkcs1v15/implicit_rejection.rs | 2 +- src/algorithms/reduction.rs | 2 +- src/algorithms/rsa.rs | 4 ++-- src/encoding.rs | 4 ++-- src/key.rs | 6 ++--- src/oaep/decrypting_key.rs | 4 ++-- src/oaep/encrypting_key.rs | 4 ++-- src/pkcs1v15.rs | 2 +- src/pkcs1v15/decrypting_key.rs | 6 ++--- src/pkcs1v15/encrypting_key.rs | 4 ++-- src/pkcs1v15/signature.rs | 6 ++--- src/pkcs1v15/signing_key.rs | 16 +++++++------- src/pkcs1v15/verifying_key.rs | 12 +++++----- src/pss.rs | 2 +- src/pss/blinded_signing_key.rs | 14 ++++++------ src/pss/signature.rs | 6 ++--- src/pss/signing_key.rs | 16 +++++++------- src/pss/verifying_key.rs | 10 ++++----- src/traits/keys.rs | 2 +- tests/crt_coefficient.rs | 2 +- tests/pkcs1.rs | 2 +- tests/pkcs1v15.rs | 22 +++++++++++-------- tests/pkcs8.rs | 3 +-- tests/proptests.rs | 3 +-- tests/rfc8017.rs | 7 +++--- tests/wycheproof.rs | 4 ++-- 28 files changed, 86 insertions(+), 84 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ed207fd5..ace7a62d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "rsa" version = "0.10.0-rc.19" authors = ["RustCrypto Developers", "dignifiedquire "] -edition = "2021" +edition = "2024" description = "Pure Rust RSA implementation" license = "MIT OR Apache-2.0" documentation = "https://docs.rs/rsa" diff --git a/src/algorithms/generate.rs b/src/algorithms/generate.rs index a7dc5506..6bb46214 100644 --- a/src/algorithms/generate.rs +++ b/src/algorithms/generate.rs @@ -5,8 +5,9 @@ use alloc::vec::Vec; use crypto_bigint::{BoxedUint, Odd}; use crypto_primes::{ + Flavor, hazmat::{SetBits, SmallFactorsSieveFactory}, - is_prime, sieve_and_find, Flavor, + is_prime, sieve_and_find, }; use rand_core::CryptoRng; diff --git a/src/algorithms/pkcs1v15/implicit_rejection.rs b/src/algorithms/pkcs1v15/implicit_rejection.rs index 5aa302f0..202ac1ef 100644 --- a/src/algorithms/pkcs1v15/implicit_rejection.rs +++ b/src/algorithms/pkcs1v15/implicit_rejection.rs @@ -122,10 +122,10 @@ mod tests { mod vectors { use super::*; use crate::{ + RsaPrivateKey, algorithms::{pad::os2ip, pkcs1v15::eme_pkcs1v15_decode, rsa::rsa_decrypt_and_check}, pkcs1v15::{DecryptingKey, Pkcs1v15Encrypt}, traits::{Decryptor, PaddingScheme, PublicKeyParts, RandomizedDecryptor}, - RsaPrivateKey, }; use alloc::{collections::BTreeMap, string::String}; use pkcs8::DecodePrivateKey; diff --git a/src/algorithms/reduction.rs b/src/algorithms/reduction.rs index 656d1e7d..ad143f9c 100644 --- a/src/algorithms/reduction.rs +++ b/src/algorithms/reduction.rs @@ -1,8 +1,8 @@ //! Reduction modulo an odd, potentially secret modulus using fixed-width Montgomery arithmetic. use crypto_bigint::{ - modular::{BoxedMontyForm, BoxedMontyParams}, BoxedUint, Resize, + modular::{BoxedMontyForm, BoxedMontyParams}, }; /// Convert any input precision to Montgomery form. Loop counts and allocations depend only on diff --git a/src/algorithms/rsa.rs b/src/algorithms/rsa.rs index 657bac45..f0b3dc78 100644 --- a/src/algorithms/rsa.rs +++ b/src/algorithms/rsa.rs @@ -7,8 +7,8 @@ pub(crate) use super::reduction::to_monty; use crypto_bigint::{ - modular::BoxedMontyParams, BoxedUint, ConcatenatingMul, ConcatenatingSquare, Gcd, NonZero, Odd, - RandomMod, Resize, + BoxedUint, ConcatenatingMul, ConcatenatingSquare, Gcd, NonZero, Odd, RandomMod, Resize, + modular::BoxedMontyParams, }; use rand_core::TryCryptoRng; use zeroize::Zeroize; diff --git a/src/encoding.rs b/src/encoding.rs index 0d3d0d37..bd33df48 100644 --- a/src/encoding.rs +++ b/src/encoding.rs @@ -6,14 +6,14 @@ #![cfg(feature = "encoding")] use crate::{ - traits::{PrivateKeyParts, PublicKeyParts}, RsaPrivateKey, RsaPublicKey, + traits::{PrivateKeyParts, PublicKeyParts}, }; use core::convert::{TryFrom, TryInto}; use crypto_bigint::{BoxedUint, NonZero, Resize}; use pkcs8::{ - der::{asn1::AsUintRef, asn1::OctetStringRef, Decode}, Document, EncodePrivateKey, EncodePublicKey, ObjectIdentifier, SecretDocument, + der::{Decode, asn1::AsUintRef, asn1::OctetStringRef}, }; use zeroize::Zeroizing; diff --git a/src/key.rs b/src/key.rs index c78e2af5..de565495 100644 --- a/src/key.rs +++ b/src/key.rs @@ -3,15 +3,15 @@ use core::fmt; use core::hash::{Hash, Hasher}; use crypto_bigint::{ - modular::{BoxedMontyForm, BoxedMontyParams}, BoxedUint, ConcatenatingMul, Integer, NonZero, Odd, Resize, + modular::{BoxedMontyForm, BoxedMontyParams}, }; use rand_core::CryptoRng; use zeroize::{Zeroize, ZeroizeOnDrop}; #[cfg(feature = "serde")] use { pkcs8::{DecodePrivateKey, EncodePrivateKey}, - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, spki::{DecodePublicKey, EncodePublicKey}, }; @@ -1167,7 +1167,7 @@ mod tests { fn test_serde() { use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let mut rng = ChaCha8Rng::from_seed([42; 32]); let priv_key = RsaPrivateKey::new_unchecked(&mut rng, 64).expect("failed to generate key"); diff --git a/src/oaep/decrypting_key.rs b/src/oaep/decrypting_key.rs index d890214a..81fe8bdc 100644 --- a/src/oaep/decrypting_key.rs +++ b/src/oaep/decrypting_key.rs @@ -2,8 +2,8 @@ use super::decrypt_digest; #[cfg(not(feature = "getrandom"))] use crate::dummy_rng::DummyRng; use crate::{ - traits::{Decryptor, RandomizedDecryptor}, Result, RsaPrivateKey, + traits::{Decryptor, RandomizedDecryptor}, }; use alloc::{boxed::Box, vec::Vec}; use core::marker::PhantomData; @@ -121,7 +121,7 @@ mod tests { use super::*; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/oaep/encrypting_key.rs b/src/oaep/encrypting_key.rs index 2d10b8e3..7ea6e562 100644 --- a/src/oaep/encrypting_key.rs +++ b/src/oaep/encrypting_key.rs @@ -1,5 +1,5 @@ use super::encrypt_digest; -use crate::{traits::RandomizedEncryptor, Result, RsaPublicKey}; +use crate::{Result, RsaPublicKey, traits::RandomizedEncryptor}; use alloc::{boxed::Box, vec::Vec}; use core::marker::PhantomData; use digest::{Digest, FixedOutputReset}; @@ -79,7 +79,7 @@ mod tests { use super::*; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let mut rng = ChaCha8Rng::from_seed([42; 32]); let priv_key = diff --git a/src/pkcs1v15.rs b/src/pkcs1v15.rs index 5b05a4cb..1e14b992 100644 --- a/src/pkcs1v15.rs +++ b/src/pkcs1v15.rs @@ -300,9 +300,9 @@ pub use oid::RsaSignatureAssociatedOid; mod tests { use super::*; use ::signature::{ - hazmat::{PrehashSigner, PrehashVerifier}, DigestSigner, DigestVerifier, Keypair, RandomizedDigestSigner, RandomizedSigner, SignatureEncoding, Signer, Verifier, + hazmat::{PrehashSigner, PrehashVerifier}, }; use base64ct::{Base64, Encoding}; use crypto_bigint::BoxedUint; diff --git a/src/pkcs1v15/decrypting_key.rs b/src/pkcs1v15/decrypting_key.rs index bd8145e1..ef283bf8 100644 --- a/src/pkcs1v15/decrypting_key.rs +++ b/src/pkcs1v15/decrypting_key.rs @@ -1,9 +1,9 @@ -use super::{decrypt, EncryptingKey}; +use super::{EncryptingKey, decrypt}; #[cfg(not(feature = "getrandom"))] use crate::dummy_rng::DummyRng; use crate::{ - traits::{Decryptor, EncryptingKeypair, RandomizedDecryptor}, Result, RsaPrivateKey, + traits::{Decryptor, EncryptingKeypair, RandomizedDecryptor}, }; use alloc::vec::Vec; use rand_core::CryptoRng; @@ -82,7 +82,7 @@ mod tests { use super::*; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let mut rng = ChaCha8Rng::from_seed([42; 32]); let decrypting_key = DecryptingKey::new( diff --git a/src/pkcs1v15/encrypting_key.rs b/src/pkcs1v15/encrypting_key.rs index 1004aa7a..23a48c19 100644 --- a/src/pkcs1v15/encrypting_key.rs +++ b/src/pkcs1v15/encrypting_key.rs @@ -1,5 +1,5 @@ use super::encrypt; -use crate::{traits::RandomizedEncryptor, Result, RsaPublicKey}; +use crate::{Result, RsaPublicKey, traits::RandomizedEncryptor}; use alloc::vec::Vec; use rand_core::CryptoRng; #[cfg(feature = "serde")] @@ -37,7 +37,7 @@ mod tests { use crate::RsaPrivateKey; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let mut rng = ChaCha8Rng::from_seed([42; 32]); let priv_key = RsaPrivateKey::new_unchecked(&mut rng, 64).expect("failed to generate key"); diff --git a/src/pkcs1v15/signature.rs b/src/pkcs1v15/signature.rs index 957f9b57..2b97c473 100644 --- a/src/pkcs1v15/signature.rs +++ b/src/pkcs1v15/signature.rs @@ -5,11 +5,11 @@ use core::fmt::{Debug, Display, Formatter, LowerHex, UpperHex}; use signature::SignatureEncoding; #[cfg(feature = "serde")] -use serdect::serde::{de, Deserialize, Serialize}; +use serdect::serde::{Deserialize, Serialize, de}; #[cfg(feature = "encoding")] use spki::{ - der::{asn1::BitString, Result as DerResult}, SignatureBitStringEncoding, + der::{Result as DerResult, asn1::BitString}, }; /// `RSASSA-PKCS1-v1_5` signatures as described in [RFC8017 § 8.2]. @@ -101,7 +101,7 @@ mod tests { #[cfg(feature = "serde")] fn test_serde() { use super::*; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let signature = Signature { inner: Box::new([0, 0, 0, 0, 0, 0, 0, 42]), }; diff --git a/src/pkcs1v15/signing_key.rs b/src/pkcs1v15/signing_key.rs index 9fd52c7a..ce118248 100644 --- a/src/pkcs1v15/signing_key.rs +++ b/src/pkcs1v15/signing_key.rs @@ -1,13 +1,13 @@ -use super::{pkcs1v15_generate_prefix, sign, Signature, VerifyingKey}; -use crate::{dummy_rng::DummyRng, Result, RsaPrivateKey}; +use super::{Signature, VerifyingKey, pkcs1v15_generate_prefix, sign}; +use crate::{Result, RsaPrivateKey, dummy_rng::DummyRng}; use alloc::vec::Vec; use const_oid::AssociatedOid; use core::marker::PhantomData; use digest::{Digest, FixedOutput, HashMarker, Update}; use rand_core::{CryptoRng, TryCryptoRng}; use signature::{ - hazmat::PrehashSigner, DigestSigner, Keypair, MultipartSigner, RandomizedDigestSigner, - RandomizedMultipartSigner, RandomizedSigner, Signer, + DigestSigner, Keypair, MultipartSigner, RandomizedDigestSigner, RandomizedMultipartSigner, + RandomizedSigner, Signer, hazmat::PrehashSigner, }; use zeroize::ZeroizeOnDrop; @@ -16,14 +16,14 @@ use { super::oid, pkcs8::{EncodePrivateKey, SecretDocument}, spki::{ - der::AnyRef, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, - SignatureAlgorithmIdentifier, + AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, SignatureAlgorithmIdentifier, + der::AnyRef, }, }; #[cfg(feature = "serde")] use { pkcs8::DecodePrivateKey, - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, }; /// Signing key for `RSASSA-PKCS1-v1_5` signatures as described in [RFC8017 § 8.2]. @@ -344,7 +344,7 @@ mod tests { use crate::RsaPrivateKey; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/pkcs1v15/verifying_key.rs b/src/pkcs1v15/verifying_key.rs index 8c2e99ac..6c4937dd 100644 --- a/src/pkcs1v15/verifying_key.rs +++ b/src/pkcs1v15/verifying_key.rs @@ -1,22 +1,22 @@ -use super::{pkcs1v15_generate_prefix, verify, Signature}; +use super::{Signature, pkcs1v15_generate_prefix, verify}; use crate::RsaPublicKey; use alloc::vec::Vec; use const_oid::AssociatedOid; use core::marker::PhantomData; use digest::{Digest, FixedOutput, HashMarker, Update}; -use signature::{hazmat::PrehashVerifier, DigestVerifier, Verifier}; +use signature::{DigestVerifier, Verifier, hazmat::PrehashVerifier}; #[cfg(feature = "encoding")] use { super::oid, spki::{ - der::AnyRef, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, Document, - EncodePublicKey, SignatureAlgorithmIdentifier, + AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, Document, EncodePublicKey, + SignatureAlgorithmIdentifier, der::AnyRef, }, }; #[cfg(feature = "serde")] use { - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, spki::DecodePublicKey, }; @@ -255,7 +255,7 @@ mod tests { use crate::RsaPrivateKey; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/pss.rs b/src/pss.rs index 48d81bf6..e139f5e8 100644 --- a/src/pss.rs +++ b/src/pss.rs @@ -39,8 +39,8 @@ use { const_oid::AssociatedOid, pkcs1::RsaPssParams, spki::{ - der::{Any, ErrorKind}, AlgorithmIdentifierOwned, + der::{Any, ErrorKind}, }, }; diff --git a/src/pss/blinded_signing_key.rs b/src/pss/blinded_signing_key.rs index be26eebd..7dcf54e1 100644 --- a/src/pss/blinded_signing_key.rs +++ b/src/pss/blinded_signing_key.rs @@ -1,11 +1,11 @@ -use super::{sign_digest, Signature, VerifyingKey}; +use super::{Signature, VerifyingKey, sign_digest}; use crate::{Result, RsaPrivateKey}; use core::marker::PhantomData; use digest::{Digest, FixedOutputReset, HashMarker, Update}; use rand_core::{CryptoRng, TryCryptoRng}; use signature::{ - hazmat::RandomizedPrehashSigner, Keypair, RandomizedDigestSigner, RandomizedMultipartSigner, - RandomizedSigner, + Keypair, RandomizedDigestSigner, RandomizedMultipartSigner, RandomizedSigner, + hazmat::RandomizedPrehashSigner, }; use zeroize::ZeroizeOnDrop; @@ -15,14 +15,14 @@ use { const_oid::AssociatedOid, pkcs8::{EncodePrivateKey, SecretDocument}, spki::{ - der::AnyRef, AlgorithmIdentifierOwned, AlgorithmIdentifierRef, - AssociatedAlgorithmIdentifier, DynSignatureAlgorithmIdentifier, + AlgorithmIdentifierOwned, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, + DynSignatureAlgorithmIdentifier, der::AnyRef, }, }; #[cfg(feature = "serde")] use { pkcs8::DecodePrivateKey, - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, }; /// Signing key for producing "blinded" RSASSA-PSS signatures as described in @@ -294,7 +294,7 @@ mod tests { use super::*; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/pss/signature.rs b/src/pss/signature.rs index 990479ee..004bbb3e 100644 --- a/src/pss/signature.rs +++ b/src/pss/signature.rs @@ -5,11 +5,11 @@ use core::fmt::{Debug, Display, Formatter, LowerHex, UpperHex}; use signature::SignatureEncoding; #[cfg(feature = "serde")] -use serdect::serde::{de, Deserialize, Serialize}; +use serdect::serde::{Deserialize, Serialize, de}; #[cfg(feature = "encoding")] use spki::{ - der::{asn1::BitString, Result as DerResult}, SignatureBitStringEncoding, + der::{Result as DerResult, asn1::BitString}, }; /// `RSASSA-PSS` signatures as described in [RFC8017 § 8.1]. @@ -101,7 +101,7 @@ mod tests { #[cfg(feature = "serde")] fn test_serde() { use super::*; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; let signature = Signature { inner: Box::new([0, 0, 0, 0, 0, 0, 0, 42]), }; diff --git a/src/pss/signing_key.rs b/src/pss/signing_key.rs index 2ede836e..bf079208 100644 --- a/src/pss/signing_key.rs +++ b/src/pss/signing_key.rs @@ -1,18 +1,18 @@ -use super::{sign_digest, Signature, VerifyingKey}; +use super::{Signature, VerifyingKey, sign_digest}; use crate::{Result, RsaPrivateKey}; use core::marker::PhantomData; use digest::{Digest, FixedOutputReset, Update}; use rand_core::{CryptoRng, TryCryptoRng}; use signature::{ - hazmat::RandomizedPrehashSigner, Keypair, RandomizedDigestSigner, RandomizedMultipartSigner, - RandomizedSigner, + Keypair, RandomizedDigestSigner, RandomizedMultipartSigner, RandomizedSigner, + hazmat::RandomizedPrehashSigner, }; use zeroize::ZeroizeOnDrop; #[cfg(feature = "serde")] use { pkcs8::DecodePrivateKey, - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, }; #[cfg(feature = "encoding")] @@ -21,15 +21,15 @@ use { const_oid::AssociatedOid, pkcs8::{EncodePrivateKey, SecretDocument}, spki::{ - der::AnyRef, AlgorithmIdentifierOwned, AlgorithmIdentifierRef, - AssociatedAlgorithmIdentifier, DynSignatureAlgorithmIdentifier, + AlgorithmIdentifierOwned, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, + DynSignatureAlgorithmIdentifier, der::AnyRef, }, }; #[cfg(feature = "getrandom")] use { crypto_common::getrandom::SysRng, - signature::{hazmat::PrehashSigner, MultipartSigner, Signer}, + signature::{MultipartSigner, Signer, hazmat::PrehashSigner}, }; /// Signing key for producing RSASSA-PSS signatures as described in @@ -331,7 +331,7 @@ mod tests { use crate::RsaPrivateKey; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/pss/verifying_key.rs b/src/pss/verifying_key.rs index 9bbec666..099b4732 100644 --- a/src/pss/verifying_key.rs +++ b/src/pss/verifying_key.rs @@ -1,19 +1,19 @@ -use super::{verify_digest, Signature}; +use super::{Signature, verify_digest}; use crate::RsaPublicKey; use core::marker::PhantomData; use digest::{Digest, FixedOutputReset, Update}; -use signature::{hazmat::PrehashVerifier, DigestVerifier, Verifier}; +use signature::{DigestVerifier, Verifier, hazmat::PrehashVerifier}; #[cfg(feature = "encoding")] use { crate::encoding::ID_RSASSA_PSS, const_oid::AssociatedOid, pkcs8::{Document, EncodePublicKey}, - spki::{der::AnyRef, AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier}, + spki::{AlgorithmIdentifierRef, AssociatedAlgorithmIdentifier, der::AnyRef}, }; #[cfg(feature = "serde")] use { - serdect::serde::{de, ser, Deserialize, Serialize}, + serdect::serde::{Deserialize, Serialize, de, ser}, spki::DecodePublicKey, }; @@ -252,7 +252,7 @@ mod tests { use crate::RsaPrivateKey; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; - use serde_test::{assert_tokens, Configure, Token}; + use serde_test::{Configure, Token, assert_tokens}; use sha2::Sha256; let mut rng = ChaCha8Rng::from_seed([42; 32]); diff --git a/src/traits/keys.rs b/src/traits/keys.rs index e15f3d54..54934cfc 100644 --- a/src/traits/keys.rs +++ b/src/traits/keys.rs @@ -3,8 +3,8 @@ use crate::key::SecretPrime; use alloc::boxed::Box; use crypto_bigint::{ - modular::{BoxedMontyForm, BoxedMontyParams}, BoxedUint, NonZero, Odd, + modular::{BoxedMontyForm, BoxedMontyParams}, }; use zeroize::Zeroize; diff --git a/tests/crt_coefficient.rs b/tests/crt_coefficient.rs index a49f028a..881c3b4f 100644 --- a/tests/crt_coefficient.rs +++ b/tests/crt_coefficient.rs @@ -1,8 +1,8 @@ //! Test explicit wide storage for unbalanced primes in both orders. use rsa::{ - traits::{PrivateKeyParts, PublicKeyParts}, BoxedUint, RsaPrivateKey, + traits::{PrivateKeyParts, PublicKeyParts}, }; fn key_and_coefficient(reverse: bool) -> (RsaPrivateKey, BoxedUint) { diff --git a/tests/pkcs1.rs b/tests/pkcs1.rs index 95539a1e..6c77a0be 100644 --- a/tests/pkcs1.rs +++ b/tests/pkcs1.rs @@ -5,9 +5,9 @@ use crypto_bigint::{BoxedUint, CtEq}; use hex_literal::hex; use rsa::{ + RsaPrivateKey, RsaPublicKey, pkcs1::{DecodeRsaPrivateKey, DecodeRsaPublicKey, EncodeRsaPrivateKey, EncodeRsaPublicKey}, traits::{PrivateKeyParts, PublicKeyParts}, - RsaPrivateKey, RsaPublicKey, }; #[cfg(feature = "encoding")] diff --git a/tests/pkcs1v15.rs b/tests/pkcs1v15.rs index ca45571e..8d8ca4c2 100644 --- a/tests/pkcs1v15.rs +++ b/tests/pkcs1v15.rs @@ -6,8 +6,8 @@ fn signature_stringify() { use pkcs8::DecodePrivateKey; use signature::Signer; - use rsa::pkcs1v15::SigningKey; use rsa::RsaPrivateKey; + use rsa::pkcs1v15::SigningKey; let pem = include_str!("examples/pkcs8/rsa2048-priv.pem"); let private_key = RsaPrivateKey::from_pkcs8_pem(pem).unwrap(); @@ -70,12 +70,16 @@ Rmb665iB5fwpqmbE/hYKIn7asYQE+V0dkgt8M3qvlJJ5JJbCrJx3 assert_eq!(sig_via_new, sig_via_from); // each verifies the other - assert!(key_via_new - .verifying_key() - .verify(msg, &sig_via_from) - .is_ok()); - assert!(key_via_from - .verifying_key() - .verify(msg, &sig_via_new) - .is_ok()); + assert!( + key_via_new + .verifying_key() + .verify(msg, &sig_via_from) + .is_ok() + ); + assert!( + key_via_from + .verifying_key() + .verify(msg, &sig_via_new) + .is_ok() + ); } diff --git a/tests/pkcs8.rs b/tests/pkcs8.rs index b476f3aa..f19b19c7 100644 --- a/tests/pkcs8.rs +++ b/tests/pkcs8.rs @@ -5,11 +5,10 @@ use crypto_bigint::{BoxedUint, CtEq}; use hex_literal::hex; use rsa::{ - pkcs1v15, + RsaPrivateKey, RsaPublicKey, pkcs1v15, pkcs8::{DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey}, pss, traits::{PrivateKeyParts, PublicKeyParts}, - RsaPrivateKey, RsaPublicKey, }; use sha2::Sha256; diff --git a/tests/proptests.rs b/tests/proptests.rs index 42cbe1e4..142a8839 100644 --- a/tests/proptests.rs +++ b/tests/proptests.rs @@ -6,9 +6,8 @@ use proptest::prelude::*; use rand::rngs::ChaCha8Rng; use rand_core::SeedableRng; use rsa::{ - pkcs1v15, + RsaPrivateKey, pkcs1v15, signature::{Keypair, SignatureEncoding, Signer, Verifier}, - RsaPrivateKey, }; use sha2::Sha256; diff --git a/tests/rfc8017.rs b/tests/rfc8017.rs index 46359828..3853b191 100644 --- a/tests/rfc8017.rs +++ b/tests/rfc8017.rs @@ -1,13 +1,12 @@ //! Regression tests for RFC8017 signature representation and verification boundaries. -use rand::{rngs::ChaCha8Rng, SeedableRng}; +use rand::{SeedableRng, rngs::ChaCha8Rng}; use rsa::{ - pkcs1v15, pss, + BoxedUint, Pkcs1v15Sign, Pss, RsaPrivateKey, RsaPublicKey, pkcs1v15, pss, signature::{ - hazmat::PrehashVerifier, DigestVerifier, RandomizedSigner, SignatureEncoding, Verifier, + DigestVerifier, RandomizedSigner, SignatureEncoding, Verifier, hazmat::PrehashVerifier, }, traits::PublicKeyParts, - BoxedUint, Pkcs1v15Sign, Pss, RsaPrivateKey, RsaPublicKey, }; use sha2::{Digest, Sha256}; diff --git a/tests/wycheproof.rs b/tests/wycheproof.rs index 17299bbc..5843037d 100644 --- a/tests/wycheproof.rs +++ b/tests/wycheproof.rs @@ -9,13 +9,13 @@ use std::{fmt::Debug, fs::File}; use pkcs1::DecodeRsaPublicKey; use pkcs8::DecodePrivateKey; -use rsa::{pkcs1v15, pss, signature::Verifier, Oaep, RsaPrivateKey, RsaPublicKey}; +use rsa::{Oaep, RsaPrivateKey, RsaPublicKey, pkcs1v15, pss, signature::Verifier}; use rstest::rstest; use serde::Deserialize; use sha1::Sha1; use sha2::{ - digest::{Digest, FixedOutputReset}, Sha224, Sha256, Sha384, Sha512, Sha512_224, Sha512_256, + digest::{Digest, FixedOutputReset}, }; #[derive(Deserialize, Debug)]