tls: update BoringSSL to cacb5526 (4896). (envoyproxy#20322)

Signed-off-by: Piotr Sikora <[email protected]>
ravenblackx · Jun 8, 2022 · c1d80e1 · c1d80e1
1 parent 1b9c648
commit c1d80e1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/bazel/boringssl_static.patch b/bazel/boringssl_static.patch
@@ -1,24 +1,28 @@
 diff --git a/BUILD b/BUILD
-index d7c731bf6..315cdeca0 100644
+index cfa695a44..e748f9b46 100644
 --- a/BUILD
 +++ b/BUILD
-@@ -88,6 +88,7 @@ boringssl_copts = select({
-     ":windows_x86_64": [
-         "-DWIN32_LEAN_AND_MEAN",
-         "-DOPENSSL_NO_ASM",
+@@ -101,7 +101,10 @@ linux_copts = posix_copts + [
+ boringssl_copts = select({
+     "@platforms//os:linux": linux_copts,
+     "@platforms//os:macos": posix_copts,
+-    "@platforms//os:windows": ["-DWIN32_LEAN_AND_MEAN"],
++    "@platforms//os:windows": [
++        "-DWIN32_LEAN_AND_MEAN",
 +        "-DBORINGSSL_IMPLEMENTATION",
-     ],
-     "//conditions:default": ["-DOPENSSL_NO_ASM"],
++    ],
+     "//conditions:default": [],
  })
-@@ -141,6 +142,7 @@ cc_library(
-         ":windows_x86_64": ["-defaultlib:advapi32.lib"],
+
+@@ -163,6 +166,7 @@ cc_library(
+         "@platforms//os:windows": ["-defaultlib:advapi32.lib"],
          "//conditions:default": ["-lpthread"],
      }),
 +    linkstatic = True,
      visibility = ["//visibility:public"],
  )
 
-@@ -150,6 +152,7 @@ cc_library(
+@@ -172,6 +176,7 @@ cc_library(
      hdrs = ssl_headers,
      copts = boringssl_copts_cxx,
      includes = ["src/include"],

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -80,13 +80,13 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         # 2. Open https://chromium.googlesource.com/chromium/src/+/refs/tags/<current_version>/DEPS and note <boringssl_revision>.
         # 3. Find a commit in BoringSSL's "master-with-bazel" branch that merges <boringssl_revision>.
         #
-        # chromium-99.0.4844.17 (linux/beta)
-        version = "5416e4f16bffdc24e71e84d6e3977eed73c6f6b3",
-        sha256 = "864cb8005739db6f2b615ed167ba12a88a7f5c54e39c911e1c271fdfad21a3e7",
+        # chromium-100.0.4896.30 (linux/beta)
+        version = "cacb5526268191ab52e3a8b2d71f686115776646",
+        sha256 = "fd72798ee22beb9f052d792d6c701d3ea94183c2e5b94e737866a53152b46f41",
         strip_prefix = "boringssl-{version}",
         urls = ["https://github.com/google/boringssl/archive/{version}.tar.gz"],
         use_category = ["controlplane", "dataplane_core"],
-        release_date = "2022-01-05",
+        release_date = "2022-02-08",
         cpe = "cpe:2.3:a:google:boringssl:*",
     ),
     boringssl_fips = dict(