Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update openssl crate for supporting openssl v3.0 #490

Merged
merged 1 commit into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions impl/Cargo.lock

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

Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ cargo_build_script(
{%- endfor -%}
{%- else -%}
{%- endif %},
)
)
30 changes: 20 additions & 10 deletions third_party/cargo/crates.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1721,12 +1721,22 @@ def cargo_raze_fetch_remote_crates():

maybe(
http_archive,
name = "cargo_raze__openssl__0_10_33",
url = "https://crates.io/api/v1/crates/openssl/0.10.33/download",
name = "cargo_raze__openssl__0_10_40",
url = "https://crates.io/api/v1/crates/openssl/0.10.40/download",
type = "tar.gz",
sha256 = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577",
strip_prefix = "openssl-0.10.33",
build_file = Label("//third_party/cargo/remote:BUILD.openssl-0.10.33.bazel"),
sha256 = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e",
strip_prefix = "openssl-0.10.40",
build_file = Label("//third_party/cargo/remote:BUILD.openssl-0.10.40.bazel"),
)

maybe(
http_archive,
name = "cargo_raze__openssl_macros__0_1_0",
url = "https://crates.io/api/v1/crates/openssl-macros/0.1.0/download",
type = "tar.gz",
sha256 = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c",
strip_prefix = "openssl-macros-0.1.0",
build_file = Label("//third_party/cargo/remote:BUILD.openssl-macros-0.1.0.bazel"),
)

maybe(
Expand All @@ -1741,12 +1751,12 @@ def cargo_raze_fetch_remote_crates():

maybe(
http_archive,
name = "cargo_raze__openssl_sys__0_9_61",
url = "https://crates.io/api/v1/crates/openssl-sys/0.9.61/download",
name = "cargo_raze__openssl_sys__0_9_73",
url = "https://crates.io/api/v1/crates/openssl-sys/0.9.73/download",
type = "tar.gz",
sha256 = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f",
strip_prefix = "openssl-sys-0.9.61",
build_file = Label("//third_party/cargo/remote:BUILD.openssl-sys-0.9.61.bazel"),
sha256 = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0",
strip_prefix = "openssl-sys-0.9.73",
build_file = Label("//third_party/cargo/remote:BUILD.openssl-sys-0.9.73.bazel"),
)

maybe(
Expand Down
4 changes: 2 additions & 2 deletions third_party/cargo/remote/BUILD.curl-0.4.35.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ cargo_build_script(
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
Expand Down Expand Up @@ -126,7 +126,7 @@ rust_library(
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_probe__0_1_2//:openssl_probe",
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
Expand Down
2 changes: 1 addition & 1 deletion third_party/cargo/remote/BUILD.git2-0.13.20.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ rust_library(
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_probe__0_1_2//:openssl_probe",
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ rust_library(
"@rules_rust//rust/platform:aarch64-apple-darwin",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}),
Expand Down
4 changes: 2 additions & 2 deletions third_party/cargo/remote/BUILD.libssh2-sys-0.2.21.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cargo_build_script(
"@rules_rust//rust/platform:aarch64-apple-darwin",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}),
Expand Down Expand Up @@ -132,7 +132,7 @@ rust_library(
"@rules_rust//rust/platform:aarch64-apple-darwin",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}),
Expand Down
6 changes: 3 additions & 3 deletions third_party/cargo/remote/BUILD.native-tls-0.2.7.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ cargo_build_script(
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
Expand Down Expand Up @@ -136,9 +136,9 @@ rust_library(
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
): [
"@cargo_raze__log__0_4_14//:log",
"@cargo_raze__openssl__0_10_33//:openssl",
"@cargo_raze__openssl__0_10_40//:openssl",
"@cargo_raze__openssl_probe__0_1_2//:openssl_probe",
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "0.10.33",
version = "0.10.40",
visibility = ["//visibility:private"],
deps = [
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
)

Expand All @@ -67,13 +67,16 @@ rust_library(
name = "openssl",
srcs = glob(["**/*.rs"]),
aliases = {
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys": "ffi",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys": "ffi",
},
crate_features = [
],
crate_root = "src/lib.rs",
data = [],
edition = "2018",
proc_macro_deps = [
"@cargo_raze__openssl_macros__0_1_0//:openssl_macros",
],
rustc_flags = [
"--cap-lints=allow",
],
Expand All @@ -82,7 +85,7 @@ rust_library(
"crate-name=openssl",
"manual",
],
version = "0.10.33",
version = "0.10.40",
# buildifier: leave-alone
deps = [
":openssl_build_script",
Expand All @@ -92,6 +95,6 @@ rust_library(
"@cargo_raze__libc__0_2_92//:libc",
"@cargo_raze__once_cell__1_7_2//:once_cell",
"@cargo_raze__openssl//:openssl",
"@cargo_raze__openssl_sys__0_9_61//:openssl_sys",
"@cargo_raze__openssl_sys__0_9_73//:openssl_sys",
],
)
57 changes: 57 additions & 0 deletions third_party/cargo/remote/BUILD.openssl-macros-0.1.0.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
"""
@generated
cargo-raze crate build file.

DO NOT EDIT! Replaced on runs of cargo-raze
"""

# buildifier: disable=load
load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

package(default_visibility = [
# Public for visibility by "@raze__crate__version//" targets.
#
# Prefer access through "//third_party/cargo", which limits external
# visibility to explicit Cargo.toml dependencies.
"//visibility:public",
])

licenses([
"notice", # MIT from expression "MIT OR Apache-2.0"
])

# Generated Targets

rust_proc_macro(
name = "openssl_macros",
srcs = glob(["**/*.rs"]),
crate_features = [
],
crate_root = "src/lib.rs",
data = [],
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=openssl-macros",
"manual",
],
version = "0.1.0",
# buildifier: leave-alone
deps = [
"@cargo_raze__proc_macro2__1_0_26//:proc_macro2",
"@cargo_raze__quote__1_0_9//:quote",
"@cargo_raze__syn__1_0_68//:syn",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "0.9.61",
version = "0.9.73",
visibility = ["//visibility:private"],
deps = [
"@cargo_raze__autocfg__1_0_1//:autocfg",
Expand Down Expand Up @@ -96,7 +96,7 @@ rust_library(
"crate-name=openssl-sys",
"manual",
],
version = "0.9.61",
version = "0.9.73",
# buildifier: leave-alone
deps = [
":openssl_sys_build_script",
Expand Down