diff --git a/Cargo.lock b/Cargo.lock index 8af2763835..81d4356c84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,7 +758,7 @@ dependencies = [ "cfg-if", "ciborium", "cms", - "const-oid", + "const-oid 0.9.6", "der 0.7.10", "ecdsa", "ed25519-dalek", @@ -769,17 +769,17 @@ dependencies = [ "p256", "p384", "p521", - "pem-rfc7468", + "pem-rfc7468 0.7.0", "pkiprocmacros", "readonly", "regex", "serde", "sha-1", "sha2", - "spki", + "spki 0.7.3", "subtle-encoding", "url", - "x509-cert", + "x509-cert 0.2.5", "x509-ocsp", ] @@ -928,10 +928,10 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b77c319abfd5219629c45c34c89ba945ed3c5e49fcde9d16b6c3885f118a730" dependencies = [ - "const-oid", + "const-oid 0.9.6", "der 0.7.10", - "spki", - "x509-cert", + "spki 0.7.3", + "x509-cert 0.2.5", ] [[package]] @@ -995,6 +995,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const_format" version = "0.2.36" @@ -1116,7 +1122,7 @@ dependencies = [ "serde-wasm-bindgen", "serde_json", "sha2", - "signature", + "signature 2.2.0", "smol", "smol-macros", "strum", @@ -1133,7 +1139,7 @@ dependencies = [ "wasm-bindgen-test", "web-time", "wire-e2e-identity", - "x509-cert", + "x509-cert 0.3.0", "zeroize", ] @@ -1170,7 +1176,7 @@ dependencies = [ "uuid", "web-sys", "wire-e2e-identity", - "x509-cert", + "x509-cert 0.3.0", ] [[package]] @@ -1230,7 +1236,7 @@ dependencies = [ "wasm-bindgen-test", "web-sys", "web-time", - "x509-cert", + "x509-cert 0.3.0", "zeroize", ] @@ -1506,10 +1512,10 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", - "der_derive", + "const-oid 0.9.6", + "der_derive 0.7.3", "flagset", - "pem-rfc7468", + "pem-rfc7468 0.7.0", "zeroize", ] @@ -1519,6 +1525,10 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" dependencies = [ + "const-oid 0.10.2", + "der_derive 0.8.0", + "flagset", + "pem-rfc7468 1.0.0", "zeroize", ] @@ -1533,6 +1543,17 @@ dependencies = [ "syn", ] +[[package]] +name = "der_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "deranged" version = "0.5.8" @@ -1572,7 +1593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid", + "const-oid 0.9.6", "crypto-common 0.1.6", "subtle", ] @@ -1650,8 +1671,8 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature", - "spki", + "signature 2.2.0", + "spki 0.7.3", ] [[package]] @@ -1662,7 +1683,7 @@ checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", "serde", - "signature", + "signature 2.2.0", ] [[package]] @@ -1705,7 +1726,7 @@ dependencies = [ "generic-array", "group", "hkdf", - "pem-rfc7468", + "pem-rfc7468 0.7.0", "pkcs8", "rand_core 0.6.4", "sec1", @@ -2255,7 +2276,7 @@ dependencies = [ "http 1.4.2", "httpdate", "mime", - "sha1", + "sha1 0.10.6", ] [[package]] @@ -3003,7 +3024,7 @@ dependencies = [ "serde_json", "sha-1", "sha2", - "spki", + "spki 0.7.3", "thiserror 1.0.69", "zeroize", ] @@ -3019,7 +3040,7 @@ dependencies = [ "elliptic-curve", "once_cell", "sha2", - "signature", + "signature 2.2.0", ] [[package]] @@ -3590,7 +3611,7 @@ dependencies = [ "thiserror 1.0.69", "tls_codec", "web-time", - "x509-cert", + "x509-cert 0.2.5", ] [[package]] @@ -3623,7 +3644,7 @@ dependencies = [ "p521", "rand_core 0.6.4", "serde", - "signature", + "signature 2.2.0", "tls_codec", "zeroize", ] @@ -3635,7 +3656,7 @@ source = "git+https://github.com/wireapp/openmls?rev=c9cde17076508968c9cbead5728 dependencies = [ "async-trait", "base64 0.21.7", - "const-oid", + "const-oid 0.9.6", "openmls_basic_credential", "openmls_traits", "percent-encoding", @@ -3644,7 +3665,7 @@ dependencies = [ "tls_codec", "uuid", "web-time", - "x509-cert", + "x509-cert 0.2.5", ] [[package]] @@ -3853,6 +3874,15 @@ dependencies = [ "base64ct", ] +[[package]] +name = "pem-rfc7468" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -3968,7 +3998,7 @@ checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ "der 0.7.10", "pkcs8", - "spki", + "spki 0.7.3", ] [[package]] @@ -3978,7 +4008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der 0.7.10", - "spki", + "spki 0.7.3", ] [[package]] @@ -4510,7 +4540,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", + "const-oid 0.9.6", "digest 0.10.7", "num-bigint-dig", "num-integer", @@ -4518,8 +4548,8 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core 0.6.4", - "signature", - "spki", + "signature 2.2.0", + "spki 0.7.3", "subtle", "zeroize", ] @@ -5102,6 +5132,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", +] + [[package]] name = "sha1_smol" version = "1.0.1" @@ -5144,6 +5185,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" +dependencies = [ + "rand_core 0.10.1", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -5258,6 +5308,16 @@ dependencies = [ "sha2", ] +[[package]] +name = "spki" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" +dependencies = [ + "base64ct", + "der 0.8.0", +] + [[package]] name = "sqlite-wasm-rs" version = "0.5.5" @@ -7162,7 +7222,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "certval", - "const-oid", + "const-oid 0.9.6", "core-crypto-keystore", "core-crypto-macros", "der 0.8.0", @@ -7198,10 +7258,10 @@ dependencies = [ "scraper", "serde", "serde_json", - "sha1", + "sha1 0.10.6", "shlex", - "signature", - "spki", + "signature 2.2.0", + "spki 0.7.3", "testcontainers", "thiserror 2.0.18", "time", @@ -7211,7 +7271,7 @@ dependencies = [ "wasm-bindgen-test", "web-time", "wire-e2e-identity", - "x509-cert", + "x509-cert 0.3.0", "zeroize", ] @@ -7333,11 +7393,23 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" dependencies = [ - "const-oid", + "const-oid 0.9.6", "der 0.7.10", - "sha1", - "signature", - "spki", + "spki 0.7.3", + "tls_codec", +] + +[[package]] +name = "x509-cert" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "105ef4642d9cb137ef83d623d0e4bf08b8adf69e9918ca904a174adb6d3d038b" +dependencies = [ + "const-oid 0.10.2", + "der 0.8.0", + "sha1 0.11.0", + "signature 3.0.0", + "spki 0.8.0", "tls_codec", ] @@ -7347,10 +7419,10 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e54e695a31f0fecb826cf59ae2093c941d7ef932a1f8508185dd23b29ce2e2e" dependencies = [ - "const-oid", + "const-oid 0.9.6", "der 0.7.10", - "spki", - "x509-cert", + "spki 0.7.3", + "x509-cert 0.2.5", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fc1744601b..65668121bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ typed-builder = "0.23.2" uniffi = "0.29.5" url = "2.5" uuid = "1.23" -x509-cert = "0.2" +x509-cert = "0.3" zeroize = "1.8" certval = { git = "https://github.com/wireapp/rust-pki.git", branch = "wire/stable", package = "certval", default-features = false, features = [