Skip to content

Commit 16d6770

Browse files
frncs-rssCQ Bot
authored andcommitted
[rust][3p] fork rust-openssl with 2 patches
we temporarily need 2 patches: 1. encrypt.rs: rust-openssl/rust-openssl#2372 already upstream waiting for the next quarterly release 2. ec.rs: rust-openssl/rust-openssl#2371 rejected upstream waiting to be inlined into KeyMint tracked by https://fxbug.dev/398863191 Fixed: 395970649 Change-Id: I12a795f645b74297948eddb6baaa8ca44df7404d Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1219109 Reviewed-by: Erick Tryzelaar <[email protected]> Commit-Queue: Francois Rousseau <[email protected]>
1 parent 6882cc3 commit 16d6770

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+22
-6
lines changed

third_party/rust_crates/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10502,14 +10502,14 @@ rust_library("openat-v0_1_17") {
1050210502
license("openssl-v0_10_71.license") {
1050310503
public_package_name = "openssl"
1050410504
license_files = [
10505-
"//third_party/rust_crates/vendor/openssl-0.10.71/LICENSE",
10506-
"//third_party/rust_crates/vendor/openssl-0.10.71/LICENSE-APACHE",
10505+
"//third_party/rust_crates/forks/openssl-0.10.71/LICENSE",
10506+
"//third_party/rust_crates/forks/openssl-0.10.71/LICENSE-APACHE",
1050710507
]
1050810508
}
1050910509

1051010510
rust_library("openssl-v0_10_71") {
1051110511
crate_name = "openssl"
10512-
crate_root = "//third_party/rust_crates/vendor/openssl-0.10.71/src/lib.rs"
10512+
crate_root = "//third_party/rust_crates/forks/openssl-0.10.71/src/lib.rs"
1051310513
output_name = "openssl-edabd54f77d41c78"
1051410514
configs += [ "//third_party/boringssl/rust:osslconf" ]
1051510515
configs -= [ "//build/config/rust:2018_idioms" ]

third_party/rust_crates/Cargo.lock

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

third_party/rust_crates/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,10 @@ nom-7_1_3 = { package = "nom", path = "forks/nom" }
417417
nom-language = { package = "nom-language", path = "forks/nom-language-0.1.0" }
418418
notify = { path = "forks/notify" }
419419
num-bigint-dig = { path = "forks/num-bigint-dig" }
420+
# rust-openssl carries 2 patches:
421+
# 1. https://github.com/sfackler/rust-openssl/pull/2372 already upstream waiting for the next quarterly release
422+
# 2. https://github.com/sfackler/rust-openssl/pull/2371 rejected upstream waiting to be inlined into KeyMint (https://fxbug.dev/398863191)
423+
openssl = { path = "forks/openssl-0.10.71" }
420424
# FIXME(118248): We can unfork once undefined behavior is resolved.
421425
prettytable-rs = { path = "forks/prettytable-rs" }
422426
#pulldown-cmark = { path = "forks/pulldown-cmark" }

0 commit comments

Comments
 (0)