From 1717a35d259a4f65a2cd1d878af5945a7d27f87d Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Wed, 10 Apr 2024 08:44:49 -0400 Subject: [PATCH 1/3] chore: downgrade to openssl v1.1.1 (again) See rust-lang#13546 --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 473865e9029..a394d407251 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2400,9 +2400,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -2432,18 +2432,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "111.28.1+1.1.1w" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "4bf7e82ffd6d3d6e6524216a0bfd85509f68b5b28354e8e7800057e44cefa9b4" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", From 399f2c765c1d2e4ac4e654ecbf4d3e834f84960d Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Wed, 10 Apr 2024 09:29:03 -0400 Subject: [PATCH 2/3] chore: tell renovatebot to not touch openssl (temporarily) --- .github/renovate.json5 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 963a28ac14a..50d5e2f0aeb 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -78,6 +78,8 @@ matchUpdateTypes: [ 'patch', ], + // See rust-lang/cargo#13546 and openssl/openssl#23376 for the exclusion + excludePackageNames: ['openssl', 'openssl-src', 'openssl-sys'], automerge: false, groupName: 'compatible', }, @@ -89,6 +91,8 @@ matchUpdateTypes: [ 'minor', ], + // See rust-lang/cargo#13546 and openssl/openssl#23376 for the exclusion + excludePackageNames: ['openssl', 'openssl-src', 'openssl-sys'], automerge: false, groupName: 'compatible', }, From 686057bdddc735881eccd26d958160d79eac5af4 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Wed, 10 Apr 2024 13:48:46 -0400 Subject: [PATCH 3/3] chore: pin openssl-sys to `=0.9.92` --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 7eb652d1b7d..37f257298d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,6 +67,7 @@ memchr = "2.7.2" miow = "0.6.0" opener = "0.7.0" openssl = "0.10.57" +openssl-sys = "=0.9.92" # See rust-lang/cargo#13546 and openssl/openssl#23376 for pinning os_info = "3.8.2" pasetors = { version = "0.6.8", features = ["v3", "paserk", "std", "serde"] } pathdiff = "0.2"