aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Noble <nicolasnoble@users.noreply.github.com>2022-05-02 09:24:22 -0700
committerGitHub <noreply@github.com>2022-05-02 09:24:22 -0700
commit31a829787bee552da920a2f861f440d36437e80e (patch)
tree20eae859705baa38a37355b1822f9b9fda3bfa6b
parent730599bd5b68f12436907cd96ab3fb20579734e7 (diff)
downloadgrpc-grpc-31a829787bee552da920a2f861f440d36437e80e.tar.gz
Upgrading zlib. (#29533)
CVE-2018-25032
-rw-r--r--bazel/grpc_deps.bzl8
m---------third_party/zlib0
-rwxr-xr-xtools/run_tests/sanity/check_submodules.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index 4cf3770034..971a35d853 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -207,11 +207,11 @@ def grpc_deps():
http_archive(
name = "zlib",
build_file = "@com_github_grpc_grpc//third_party:zlib.BUILD",
- sha256 = "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45",
- strip_prefix = "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f",
+ sha256 = "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff",
+ strip_prefix = "zlib-21767c654d31d2dccdde4330529775c6c5fd5389",
urls = [
- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
- "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz",
+ "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz",
],
)
diff --git a/third_party/zlib b/third_party/zlib
-Subproject cacf7f1d4e3d44d871b605da3b647f07d718623
+Subproject 21767c654d31d2dccdde4330529775c6c5fd538
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index e82f31d14a..ea0b433cc6 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -39,7 +39,7 @@ third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
third_party/protobuf 22d0e265de7d2b3d2e9a00d071313502e7d4cccf
third_party/re2 8e08f47b11b413302749c0d8b17a1c94777495d5
third_party/xds cb28da3451f158a947dfc45090fe92b07b243bc1
-third_party/zlib cacf7f1d4e3d44d871b605da3b647f07d718623f
+third_party/zlib 21767c654d31d2dccdde4330529775c6c5fd5389
EOF
diff -u "$submodules" "$want_submodules"