about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-06-29 08:46:10 +0900
committerGitHub <noreply@github.com>2021-06-29 08:46:10 +0900
commitc9ac096bcd5ebb8ebfe296090ba73ab4c65ecbe0 (patch)
treef0782a696ff7b61d4a0b2585fbff7f7eadcd1c32 /src
parentb5d4343c0068e3782b68311a03da6ae62033456a (diff)
parent92eedb202e408ec6c61f97d3ea6835a60888e6c6 (diff)
downloadrust-c9ac096bcd5ebb8ebfe296090ba73ab4c65ecbe0.tar.gz
rust-c9ac096bcd5ebb8ebfe296090ba73ab4c65ecbe0.zip
Rollup merge of #86529 - cuviper:ssl3, r=Mark-Simulacrum
Add support for OpenSSL 3.0.0

This updates the `openssl` and `openssl-sys` crates to support building
the toolchain with system libraries up to OpenSSL 3.0.0. This does not
affect the static version used via `openssl-src` in CI builds.

ref: https://github.com/sfackler/rust-openssl/pull/1264
Diffstat (limited to 'src')
-rw-r--r--src/tools/rustc-workspace-hack/Cargo.toml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 4a4b26da54c..26d6081c881 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -78,7 +78,7 @@ syn = { version = "1", features = ['fold', 'full', 'extra-traits', 'visit', 'vis
 url = { version = "2.0", features = ['serde'] }
 
 [target.'cfg(not(windows))'.dependencies]
-openssl = { version = "0.10.12", optional = true }
+openssl = { version = "0.10.35", optional = true }
 
 [features]
 all-static = ['openssl/vendored', 'curl-sys/static-curl', 'curl-sys/force-system-lib-on-osx']