From c9c3344a3d8e9caba8ab8f2cb5ddb6a9c2e8ba8f Mon Sep 17 00:00:00 2001
From: Aaron Nathan <aaron@pointonenav.com>
Date: Sun, 11 Jun 2023 11:53:10 -0700
Subject: [PATCH] updates to latest boringssl which eliminates need for werror
 modification

---
 bazel/repositories.bzl     |  9 +--------
 c/bazel/repositories.bzl   |  9 +--------
 c/external/boringssl.patch | 12 ------------
 external/boringssl.patch   | 12 ------------
 4 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 c/external/boringssl.patch
 delete mode 100644 external/boringssl.patch

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 7fcc468..e52ce6d 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -55,13 +55,6 @@ def dependencies():
     maybe(
         git_repository,
         name = "boringssl",
-        commit = "87f3087d6343b89142d1191388a5885d74459df2",
-        # Patch out -Werror to avoid error on GCC 11. The new warning that is
-        # triggering an error is a conversion between `const uint8_t s[32]` and
-        # `const uint8_t *s` in curve25519.c (-Werror=array-parameter=).
-        patch_args = ["-p1"],
-        patches = ["boringssl.patch"],
-        # 2020/4/7
+        commit = "5cc6bd5367d1046af217f56bf7266008e93029b2",
         remote = "https://boringssl.googlesource.com/boringssl",
-        shallow_since = "1586306564 +0000",
     )
diff --git a/c/bazel/repositories.bzl b/c/bazel/repositories.bzl
index d969032..410ac42 100644
--- a/c/bazel/repositories.bzl
+++ b/c/bazel/repositories.bzl
@@ -23,13 +23,6 @@ def dependencies():
     maybe(
         git_repository,
         name = "boringssl",
-        commit = "87f3087d6343b89142d1191388a5885d74459df2",
-        # Patch out -Werror to avoid error on GCC 11. The new warning that is
-        # triggering an error is a conversion between `const uint8_t s[32]` and
-        # `const uint8_t *s` in curve25519.c (-Werror=array-parameter=).
-        patch_args = ["-p1"],
-        patches = ["boringssl.patch"],
-        # 2020/4/7
+        commit = "5cc6bd5367d1046af217f56bf7266008e93029b2",
         remote = "https://boringssl.googlesource.com/boringssl",
-        shallow_since = "1586306564 +0000",
     )
diff --git a/c/external/boringssl.patch b/c/external/boringssl.patch
deleted file mode 100644
index d9377b0..0000000
--- a/c/external/boringssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/BUILD b/BUILD
-index 5e62b44..ab64262 100644
---- a/BUILD
-+++ b/BUILD
-@@ -68,7 +68,6 @@ posix_copts = [
-
-     # This list of warnings should match those in the top-level CMakeLists.txt.
-     "-Wall",
--    "-Werror",
-     "-Wformat=2",
-     "-Wsign-compare",
-     "-Wmissing-field-initializers",
\ No newline at end of file
diff --git a/external/boringssl.patch b/external/boringssl.patch
deleted file mode 100644
index d9377b0..0000000
--- a/external/boringssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/BUILD b/BUILD
-index 5e62b44..ab64262 100644
---- a/BUILD
-+++ b/BUILD
-@@ -68,7 +68,6 @@ posix_copts = [
-
-     # This list of warnings should match those in the top-level CMakeLists.txt.
-     "-Wall",
--    "-Werror",
-     "-Wformat=2",
-     "-Wsign-compare",
-     "-Wmissing-field-initializers",
\ No newline at end of file