Bump to signature 3

Author: baloo

Cargo.lock

@@ -85,14 +85,13 @@ aead           = { git = "https://github.com/RustCrypto/traits.git" }
 
 # https://github.com/RustCrypto/RSA/pull/478
 # https://github.com/RustCrypto/RSA/pull/504
-rsa = { git = "https://github.com/RustCrypto/RSA.git" }
+rsa = { git = "https://github.com/baloo/RSA.git", branch = "baloo/signature/3" }
 
 # https://github.com/RustCrypto/password-hashes/pull/577
 # https://github.com/RustCrypto/password-hashes/pull/578
 pbkdf2 = { git = "https://github.com/RustCrypto/password-hashes.git" }
 scrypt = { git = "https://github.com/RustCrypto/password-hashes.git" }
 
-crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" }
 crypto-primes = { git = "https://github.com/entropyxyz/crypto-primes.git" }
 
 # https://github.com/RustCrypto/elliptic-curves/pull/1125

Cargo.toml

@@ -32,7 +32,7 @@ rsa = { version = "=0.10.0-pre.4", optional = true }
 sha1 = { version = "=0.11.0-pre.5", optional = true }
 sha2 = { version = "=0.11.0-pre.5", optional = true }
 sha3 = { version = "=0.11.0-pre.5", optional = true }
-signature = { version = "=2.3.0-pre.6", features = ["digest", "alloc"], optional = true }
+signature = { version = "=3.0.0-pre", features = ["digest", "alloc"], optional = true }
 zeroize = { version = "1.8.1", optional = true }
 
 [dev-dependencies]
@@ -45,7 +45,7 @@ pbkdf2 = "0.13.0-pre.0"
 rand = "0.9"
 rsa = { version = "=0.10.0-pre.4", features = ["sha2"] }
 ecdsa = { version = "=0.17.0-pre.9", features = ["digest", "pem"] }
-p256 = "=0.14.0-pre.2"
+p256 = { version = "=0.14.0-pre.2", features = ["digest"] }
 tokio = { version = "1.43.1", features = ["macros", "rt"] }
 x509-cert = { version = "=0.3.0-pre.0", features = ["pem"] }
 

cms/Cargo.toml

@@ -146,7 +146,7 @@ fn test_build_signed_data() {
         .expect("could not add a digest algorithm")
         .add_certificate(CertificateChoices::Certificate(certificate))
         .expect("error adding certificate")
-        .add_signer_info::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature>(
+        .add_signer_info::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature<_>>(
             signer_info_builder_1,
             &signer,
         )
@@ -156,7 +156,7 @@ fn test_build_signed_data() {
             &signer_2,
         )
         .expect("error adding P256 signer info")
-        .add_signer_info_with_rng::<pss::SigningKey<Sha256>, pss::Signature, _>(
+        .add_signer_info_with_rng::<pss::SigningKey<Sha256>, pss::Signature<_>, _>(
             signer_info_builder_3,
             &signer_3,
             &mut OsRng.unwrap_err(),
@@ -393,7 +393,7 @@ fn test_build_pkcs7_scep_pkcsreq() {
         .unwrap()
         .add_certificate(CertificateChoices::Certificate(certificate))
         .unwrap()
-        .add_signer_info::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature>(
+        .add_signer_info::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature<_>>(
             signer_info_builder,
             &signer,
         )
@@ -648,13 +648,13 @@ async fn async_builder() {
     let signed_data_pkcs7 = builder
         .add_digest_algorithm(digest_algorithm)
         .expect("could not add a digest algorithm")
-        .add_signer_info_async::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature>(
+        .add_signer_info_async::<pkcs1v15::SigningKey<Sha256>, rsa::pkcs1v15::Signature<Sha256>>(
             signer_info_builder_1,
             &signer_1,
         )
         .await
         .expect("error adding PKCS1v15 RSA signer info")
-        .add_signer_info_with_rng_async::<pss::SigningKey<Sha256>, pss::Signature, _>(
+        .add_signer_info_with_rng_async::<pss::SigningKey<Sha256>, pss::Signature<_>, _>(
             signer_info_builder_3,
             &signer_3,
             &mut OsRng.unwrap_err(),

cms/tests/builder.rs

@@ -24,15 +24,15 @@ spki = { version = "0.8.0-rc.0", features = ["alloc"] }
 arbitrary = { version = "1.4", features = ["derive"], optional = true }
 digest = { version = "0.11.0-pre.10", optional = true, default-features = false }
 sha1 = { version = "0.11.0-pre.5", default-features = false, optional = true }
-signature = { version = "=2.3.0-pre.6", features = ["rand_core"], optional = true }
+signature = { version = "=3.0.0-pre", features = ["rand_core"], optional = true }
 tls_codec = { version = "0.4.0", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
 hex-literal = "1"
 rand = "0.9"
 rsa = { version = "=0.10.0-pre.4", features = ["sha2"] }
 ecdsa = { version = "=0.17.0-pre.9", features = ["digest", "pem"] }
-p256 = "=0.14.0-pre.2"
+p256 = { version = "=0.14.0-pre.2" }
 rstest = "0.25"
 sha2 = { version = "=0.11.0-pre.5", features = ["oid"] }
 tempfile = "3.5.0"

x509-cert/Cargo.toml

@@ -212,7 +212,7 @@ fn pss_certificate() {
         .expect("Create certificate");
 
     let certificate = builder
-        .build_with_rng::<_, rsa::pss::Signature, _>(&signer, &mut rand::rng())
+        .build_with_rng::<_, rsa::pss::Signature<_>, _>(&signer, &mut rand::rng())
         .unwrap();
 
     let pem = certificate.to_pem(LineEnding::LF).expect("generate pem");

x509-cert/tests/builder.rs

@@ -24,7 +24,7 @@ x509-cert = { version = "=0.3.0-pre.0", default-features = false }
 # Optional
 digest = { version = "=0.11.0-pre.10", optional = true, default-features = false, features = ["oid"] }
 rand_core = { version = "0.9", optional = true, default-features = false }
-signature = { version = "=2.3.0-pre.6", optional = true, default-features = false, features = ["digest", "rand_core"] }
+signature = { version = "=3.0.0-pre", optional = true, default-features = false, features = ["digest", "rand_core"] }
 
 [dev-dependencies]
 hex-literal = "1"