diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-29 08:46:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 08:46:10 +0900 |
| commit | c9ac096bcd5ebb8ebfe296090ba73ab4c65ecbe0 (patch) | |
| tree | f0782a696ff7b61d4a0b2585fbff7f7eadcd1c32 | |
| parent | b5d4343c0068e3782b68311a03da6ae62033456a (diff) | |
| parent | 92eedb202e408ec6c61f97d3ea6835a60888e6c6 (diff) | |
| download | rust-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
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index d57d17a3581..ffc4b036958 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2440,9 +2440,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.33" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2469,9 +2469,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.61" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg", "cc", 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'] |