diff --git a/Cargo.lock b/Cargo.lock index ec1178f11..713477560 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,7 +294,7 @@ dependencies = [ "der", "digest", "hex-literal", - "spki 0.8.0", + "spki", "x509-cert", ] @@ -324,7 +324,7 @@ dependencies = [ "sha2", "sha3", "signature", - "spki 0.8.0", + "spki", "tokio", "x509-cert", "zeroize", @@ -408,7 +408,7 @@ dependencies = [ "cms", "const-oid", "der", - "spki 0.8.0", + "spki", "x509-cert", ] @@ -551,7 +551,7 @@ dependencies = [ "elliptic-curve", "rfc6979", "signature", - "spki 0.8.0", + "spki", "zeroize", ] @@ -737,7 +737,7 @@ version = "0.2.0-pre" dependencies = [ "der", "hex-literal", - "spki 0.8.0", + "spki", "x509-cert", ] @@ -1010,7 +1010,7 @@ dependencies = [ "const-oid", "der", "hex-literal", - "spki 0.8.1", + "spki", "tempfile", ] @@ -1026,7 +1026,7 @@ dependencies = [ "pkcs5", "pkcs8", "sha2", - "spki 0.8.0", + "spki", "whirlpool", "x509-cert", "zeroize", @@ -1049,7 +1049,7 @@ dependencies = [ "scrypt", "sha1", "sha2", - "spki 0.8.0", + "spki", ] [[package]] @@ -1062,7 +1062,7 @@ dependencies = [ "hex-literal", "pkcs5", "rand_core 0.10.1", - "spki 0.8.0", + "spki", "tempfile", ] @@ -1317,8 +1317,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-rc.18" -source = "git+https://github.com/dishmaker/RSA.git?rev=96c97ec3e8b2bedde44f5954334618bec87a19c3#96c97ec3e8b2bedde44f5954334618bec87a19c3" +version = "0.10.0-rc.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33405e321e16ef941ca66e254f6904c3aafd3c7ff001fb88bf11c73eb75c2b85" dependencies = [ "const-oid", "crypto-bigint", @@ -1329,7 +1330,7 @@ dependencies = [ "rand_core 0.10.1", "sha2", "signature", - "spki 0.8.0", + "spki", "zeroize", ] @@ -1619,16 +1620,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "spki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef958a98b9d5da290cfc78946e9f3e61e1e62a18db0d92cac0b83cc161491a9" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -2013,7 +2004,7 @@ dependencies = [ "sha1", "sha2", "signature", - "spki 0.8.0", + "spki", "tempfile", "tls_codec 0.4.2", "tokio", @@ -2044,7 +2035,7 @@ dependencies = [ "sha1", "sha2", "signature", - "spki 0.8.0", + "spki", "x509-cert", ] diff --git a/Cargo.toml b/Cargo.toml index 2f9cfba53..91df57938 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,10 +61,6 @@ x509-tsp = { path = "./x509-tsp" } x509-cert = { path = "./x509-cert" } x509-ocsp = { path = "./x509-ocsp" } -# RSA: refactor: use *Ref (or *Owned) der types from RustCrypto/formats - #706 -rsa = { git = "https://github.com/dishmaker/RSA.git", rev = "96c97ec3e8b2bedde44f5954334618bec87a19c3" } - - [workspace.lints.clippy] borrow_as_ptr = "warn" cast_lossless = "warn" diff --git a/cms/Cargo.toml b/cms/Cargo.toml index 39a55ca77..00c0db688 100644 --- a/cms/Cargo.toml +++ b/cms/Cargo.toml @@ -28,7 +28,7 @@ cbc = { version = "0.2", optional = true } cipher = { version = "0.5", features = ["alloc", "block-padding", "rand_core"], optional = true } digest = { version = "0.11", optional = true } elliptic-curve = { version = "0.14.1", optional = true } -rsa = { version = "0.10.0-rc.18", optional = true } +rsa = { version = "0.10.0-rc.19", optional = true } sha1 = { version = "0.11", optional = true } sha2 = { version = "0.11", optional = true } sha3 = { version = "0.11", optional = true } @@ -43,7 +43,7 @@ pem-rfc7468 = "1" pkcs5 = "0.8" pbkdf2 = "0.13.0-rc.9" rand = "0.10" -rsa = { version = "0.10.0-rc.18", features = ["sha2"] } +rsa = { version = "0.10.0-rc.19", features = ["sha2"] } ecdsa = { version = "0.17", features = ["digest", "pem"] } p256 = "0.14" tokio = { version = "1.45.1", features = ["macros", "rt"] } diff --git a/x509-cert/Cargo.toml b/x509-cert/Cargo.toml index f5d3da6ac..4cd94e5e2 100644 --- a/x509-cert/Cargo.toml +++ b/x509-cert/Cargo.toml @@ -30,7 +30,7 @@ tls_codec = { version = "0.4", default-features = false, features = ["derive"], [dev-dependencies] hex-literal = "1" rand = "0.10" -rsa = { version = "0.10.0-rc.18", features = ["sha2"] } +rsa = { version = "0.10.0-rc.19", features = ["sha2"] } ecdsa = { version = "0.17", features = ["digest", "pem"] } p256 = "0.14" rstest = "0.26" diff --git a/x509-ocsp/Cargo.toml b/x509-ocsp/Cargo.toml index dd79505de..80994f5da 100644 --- a/x509-ocsp/Cargo.toml +++ b/x509-ocsp/Cargo.toml @@ -30,7 +30,7 @@ signature = { version = "3", optional = true, default-features = false, features hex-literal = "1" lazy_static = "1.5.0" rand = "0.10" -rsa = { version = "0.10.0-rc.18", default-features = false, features = ["encoding", "sha2"] } +rsa = { version = "0.10.0-rc.19", default-features = false, features = ["encoding", "sha2"] } sha1 = { version = "0.11", default-features = false, features = ["oid"] } sha2 = { version = "0.11", default-features = false, features = ["oid"] }