Skip to content

Commit 2dcb9b0

Browse files
authored
chore: bump openssl to v3 (#15232)
### What does this PR try to resolve? After this, Cargo in the official Rust distribution will have a hard dependency on libatomic on 32-bit platforms, until upstream issues get resolved. See <#13546 (comment)> for more details. Fixes #13546 ### How should we test and review this PR? I leave the version requirements in Cargo.toml to inclue old v1 versions, in case people really want to build cargo with the EOL OpenSSL v1. Also, I am not going to pull back <rust-lang/rust#137507>, unless someone thinks it is needed.
2 parents ffafda8 + df31681 commit 2dcb9b0

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.github/renovate.json5

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
ignorePaths: [
99
'**/tests/**',
1010
],
11-
// See rust-lang/cargo#13546 and openssl/openssl#23376 for the exclusion
12-
ignoreDeps: ['openssl', 'openssl-src', 'openssl-sys'],
1311
customManagers: [
1412
{
1513
customType: 'regex',

Cargo.lock

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ libloading = "0.8.6"
6969
memchr = "2.7.4"
7070
miow = "0.6.0"
7171
opener = "0.7.2"
72-
openssl = "=0.10.57" # See rust-lang/cargo#13546 and openssl/openssl#23376 for pinning
73-
openssl-sys = "=0.9.92" # See rust-lang/cargo#13546 and openssl/openssl#23376 for pinning
72+
openssl = "0.10.57"
73+
openssl-sys = "0.9.92"
7474
os_info = { version = "3.10.0", default-features = false }
7575
pasetors = { version = "0.7.2", features = ["v3", "paserk", "std", "serde"] }
7676
pathdiff = "0.2.3"
@@ -234,7 +234,6 @@ cargo-credential-macos-keychain.workspace = true
234234

235235
[target.'cfg(not(windows))'.dependencies]
236236
openssl = { workspace = true, optional = true }
237-
openssl-sys = { workspace = true, optional = true } # HACK: for pinning to openssl v1.
238237

239238
[target.'cfg(windows)'.dependencies]
240239
cargo-credential-wincred.workspace = true

0 commit comments

Comments
 (0)