diff --git a/Cargo.lock b/Cargo.lock index ad138bb10..465072695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" version = "0.6.0-rc.0" -source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420" +source = "git+https://github.com/RustCrypto/traits.git#5d3e03178b822f13e85ce46316e1f524ed7921c4" dependencies = [ "crypto-common", "inout", @@ -399,8 +399,9 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-bigint" -version = "0.7.0-pre.0" -source = "git+https://github.com/RustCrypto/crypto-bigint.git#e97beae6593c30b4477b7f29e30e5372cd8204bf" +version = "0.7.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6957fb7344601c8271b03e9d4c7efb46f1dee86553eee20f99e54db0cf53f36e" dependencies = [ "hybrid-array", "num-traits", @@ -413,7 +414,7 @@ dependencies = [ [[package]] name = "crypto-common" version = "0.2.0-rc.2" -source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420" +source = "git+https://github.com/RustCrypto/traits.git#5d3e03178b822f13e85ce46316e1f524ed7921c4" dependencies = [ "hybrid-array", "rand_core 0.9.3", @@ -506,7 +507,7 @@ dependencies = [ [[package]] name = "ecdsa" version = "0.17.0-pre.9" -source = "git+https://github.com/RustCrypto/signatures.git#34cd7792c248e36693d617968d38c14d4ab4618a" +source = "git+https://github.com/baloo/signatures.git?branch=baloo%2Fstd-der-signer#99d3b6433d72bdf5a8e17c0f582f904f27311711" dependencies = [ "der", "digest", @@ -525,7 +526,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elliptic-curve" version = "0.14.0-rc.1" -source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420" +source = "git+https://github.com/RustCrypto/traits.git#5d3e03178b822f13e85ce46316e1f524ed7921c4" dependencies = [ "base16ct", "crypto-bigint", @@ -903,7 +904,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "p256" version = "0.14.0-pre.2" -source = "git+https://github.com/RustCrypto/elliptic-curves.git#5ecd4718f9ce0ba092bc34edb981d63f75ed74a3" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#0611cdf1390cfa97243b383e2ceb5a581cb732c5" dependencies = [ "ecdsa", "elliptic-curve", @@ -1036,7 +1037,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.14.0-pre.2" -source = "git+https://github.com/RustCrypto/elliptic-curves.git#5ecd4718f9ce0ba092bc34edb981d63f75ed74a3" +source = "git+https://github.com/RustCrypto/elliptic-curves.git#0611cdf1390cfa97243b383e2ceb5a581cb732c5" dependencies = [ "elliptic-curve", ] @@ -1206,7 +1207,7 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rfc6979" version = "0.5.0-pre.4" -source = "git+https://github.com/RustCrypto/signatures.git#34cd7792c248e36693d617968d38c14d4ab4618a" +source = "git+https://github.com/RustCrypto/signatures.git#afe73a90c3848169f23da31098ac10116a3cf1e1" dependencies = [ "hmac", "subtle", @@ -1237,7 +1238,7 @@ dependencies = [ [[package]] name = "rsa" version = "0.10.0-pre.4" -source = "git+https://github.com/RustCrypto/RSA.git#cba78063a10fd76d10569653a8372c2af395f414" +source = "git+https://github.com/baloo/RSA.git?branch=baloo%2Fsignature%2F3#22a4bd91432f09923dbed8327b94bb617a4de9cf" dependencies = [ "const-oid", "crypto-bigint", @@ -1480,8 +1481,8 @@ dependencies = [ [[package]] name = "signature" -version = "2.3.0-pre.6" -source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420" +version = "3.0.0-pre" +source = "git+https://github.com/RustCrypto/traits.git#5d3e03178b822f13e85ce46316e1f524ed7921c4" dependencies = [ "digest", "rand_core 0.9.3", diff --git a/Cargo.toml b/Cargo.toml index 9f7f7875c..ccdb4d315 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ x509-ocsp = { path = "./x509-ocsp" } # https://github.com/RustCrypto/signatures/pull/913 # https://github.com/RustCrypto/signatures/pull/923 -ecdsa = { git = "https://github.com/RustCrypto/signatures.git" } +ecdsa = { git = "https://github.com/baloo/signatures.git", branch = "baloo/std-der-signer" } rfc6979 = { git = "https://github.com/RustCrypto/signatures.git" } # https://github.com/RustCrypto/key-wraps/pull/34 # https://github.com/RustCrypto/key-wraps/pull/35 @@ -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 diff --git a/cms/Cargo.toml b/cms/Cargo.toml index fe3e68262..dcb9a316d 100644 --- a/cms/Cargo.toml +++ b/cms/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"] } diff --git a/cms/tests/builder.rs b/cms/tests/builder.rs index e4e9bba21..ec1de1ff5 100644 --- a/cms/tests/builder.rs +++ b/cms/tests/builder.rs @@ -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::, rsa::pkcs1v15::Signature>( + .add_signer_info::, 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::Signature, _>( + .add_signer_info_with_rng::, 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::, rsa::pkcs1v15::Signature>( + .add_signer_info::, 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::, rsa::pkcs1v15::Signature>( + .add_signer_info_async::, rsa::pkcs1v15::Signature>( signer_info_builder_1, &signer_1, ) .await .expect("error adding PKCS1v15 RSA signer info") - .add_signer_info_with_rng_async::, pss::Signature, _>( + .add_signer_info_with_rng_async::, pss::Signature<_>, _>( signer_info_builder_3, &signer_3, &mut OsRng.unwrap_err(), diff --git a/x509-cert/Cargo.toml b/x509-cert/Cargo.toml index b805a02d0..1fdab8f58 100644 --- a/x509-cert/Cargo.toml +++ b/x509-cert/Cargo.toml @@ -24,7 +24,7 @@ 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] @@ -32,7 +32,7 @@ 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" diff --git a/x509-cert/tests/builder.rs b/x509-cert/tests/builder.rs index ca63adb4e..f9a1b2c11 100644 --- a/x509-cert/tests/builder.rs +++ b/x509-cert/tests/builder.rs @@ -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"); diff --git a/x509-ocsp/Cargo.toml b/x509-ocsp/Cargo.toml index f0e26d506..d0cc8d001 100644 --- a/x509-ocsp/Cargo.toml +++ b/x509-ocsp/Cargo.toml @@ -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"