Skip to content

Commit

Permalink
chore(deps): Remove openssl-sys patch (#18495)
Browse files Browse the repository at this point in the history
As `0.9.93` switches to OpenSSL `300.1.2`.

Also switch to upstream for `openssl-src` since the PR we needed was merged in there (just
unreleased).

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
  • Loading branch information
jszwedko authored Sep 6, 2023
1 parent c150b14 commit 8ec87eb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
15 changes: 8 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,8 @@ nix = { git = "https://github.com/vectordotdev/nix.git", branch = "memfd/gnu/mus
# The `heim` crates depend on `ntapi` 0.3.7 on Windows, but that version has an
# unaligned access bug fixed in the following revision.
ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e38e5f154e6011dc9b270da6" }
# The current `openssl-sys` crate will vendor the OpenSSL sources via
# `openssl-src` at version 1.1.1*, but we want version 3.1.*. Bring in forked
# version of that crate with the appropriate dependency patched in.
openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl", tag = "openssl-sys-v0.9.92_3.0.0" }
openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs", tag = "release-300-force-engine_3.1.2" }

# 300.1.3+3.1.2 + a commit that re-adds force-engine flag. Can be removed after next release of openssl-src.
openssl-src = { git = "https://github.com/alexcrichton/openssl-src-rs", ref = "26dc3c81d8ebee5f7ec40835e29bf9f37e648ab2" }

[features]
# Default features for *-unknown-linux-gnu and *-apple-darwin
Expand Down

0 comments on commit 8ec87eb

Please sign in to comment.