diff --git a/Cargo.lock b/Cargo.lock index f62c5eea8..0468d3394 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arrayref" @@ -1206,7 +1206,7 @@ dependencies = [ [[package]] name = "diesel" version = "2.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "diesel_derives", "downcast-rs", @@ -1236,7 +1236,7 @@ dependencies = [ [[package]] name = "diesel_derives" version = "2.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", @@ -1248,7 +1248,7 @@ dependencies = [ [[package]] name = "diesel_migrations" version = "2.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "diesel", "migrations_internals", @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" version = "0.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "syn 2.0.79", ] @@ -1341,7 +1341,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dsl_auto_type" version = "0.1.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "darling", "either", @@ -2964,9 +2964,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" @@ -3114,7 +3114,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "migrations_internals" version = "2.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "serde", "toml 0.8.19", @@ -3123,7 +3123,7 @@ dependencies = [ [[package]] name = "migrations_macros" version = "2.2.0" -source = "git+https://github.com/diesel-rs/diesel?branch=master#efd59557a15322f1a54a5c263b1eb4ec0b5a0783" +source = "git+https://github.com/diesel-rs/diesel?branch=master#b170af753cc3c6774f578aae1081711a09dfa2ac" dependencies = [ "migrations_internals", "proc-macro2", @@ -3619,9 +3619,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -3651,18 +3651,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "111.28.2+1.1.1w" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "bb1830e20a48a975ca898ca8c1d036a36c3c6c5cb7dabc1c216706587857920f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -4976,9 +4976,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2" dependencies = [ "itoa", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 03be9ffb3..700f2c267 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,8 +72,8 @@ web-sys = "0.3" js-sys = "0.3" # NOTE: A regression in openssl-sys exists where libatomic is dynamically linked # for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163 -openssl-sys = "0.9.104" -openssl = "0.10.68" +openssl-sys = "=0.9.92" +openssl = "=0.10.57" libsqlite3-sys = { version = "0.29", features = ["bundled-sqlcipher-vendored-openssl" ] } dyn-clone = "1" trait-variant = "0.1.2" diff --git a/bindings_ffi/Cargo.toml b/bindings_ffi/Cargo.toml index c2dd3ff8e..286545d10 100644 --- a/bindings_ffi/Cargo.toml +++ b/bindings_ffi/Cargo.toml @@ -31,7 +31,7 @@ name = "ffi-uniffi-bindgen" path = "src/bin.rs" [dev-dependencies] -ethers = { workspace = true, features = ["openssl"] } +ethers = { workspace = true, features = ["rustls"] } rand.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } uniffi = { version = "0.28.0", features = ["bindgen-tests"] } diff --git a/xmtp_id/Cargo.toml b/xmtp_id/Cargo.toml index 9210c997d..68147b20f 100644 --- a/xmtp_id/Cargo.toml +++ b/xmtp_id/Cargo.toml @@ -27,15 +27,14 @@ tracing.workspace = true xmtp_cryptography.workspace = true xmtp_proto = { workspace = true, features = ["proto_full"] } wasm-timer.workspace = true +ethers = { workspace = true, features = ["rustls"] } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2", features = ["js"] } openmls = { workspace = true, features = ["js"] } -ethers = { workspace = true, features = ["rustls"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] openmls.workspace = true -ethers = { workspace = true, features = ["openssl"] } [dev-dependencies] xmtp_v2 = { path = "../xmtp_v2" }