Merge pull request #15296 from jtattermusch/bump_boringssl

Upgrade boringssl to current chromium-stable

3 files changed, 62 insertions, 4 deletions

diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6357159e96..0af4e19a1a 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -5453,6 +5453,20 @@
   {
     "deps": [
       "boringssl", 
+      "boringssl_self_test_lib", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "boringssl_self_test", 
+    "src": [], 
+    "third_party": true, 
+    "type": "target"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
       "boringssl_file_test_gtest_lib", 
       "boringssl_test_util"
     ], 
@@ -7740,18 +7754,18 @@
       "third_party/boringssl/crypto/fipsmodule/ec/internal.h", 
       "third_party/boringssl/crypto/fipsmodule/ec/oct.c", 
       "third_party/boringssl/crypto/fipsmodule/ec/p224-64.c", 
-      "third_party/boringssl/crypto/fipsmodule/ec/p256-64.c", 
       "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h", 
       "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c", 
       "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h", 
       "third_party/boringssl/crypto/fipsmodule/ec/simple.c", 
-      "third_party/boringssl/crypto/fipsmodule/ec/util-64.c", 
+      "third_party/boringssl/crypto/fipsmodule/ec/util.c", 
       "third_party/boringssl/crypto/fipsmodule/ec/wnaf.c", 
       "third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c", 
       "third_party/boringssl/crypto/fipsmodule/hmac/hmac.c", 
       "third_party/boringssl/crypto/fipsmodule/md4/md4.c", 
       "third_party/boringssl/crypto/fipsmodule/md5/md5.c", 
       "third_party/boringssl/crypto/fipsmodule/modes/cbc.c", 
+      "third_party/boringssl/crypto/fipsmodule/modes/ccm.c", 
       "third_party/boringssl/crypto/fipsmodule/modes/cfb.c", 
       "third_party/boringssl/crypto/fipsmodule/modes/ctr.c", 
       "third_party/boringssl/crypto/fipsmodule/modes/gcm.c", 
@@ -7767,10 +7781,13 @@
       "third_party/boringssl/crypto/fipsmodule/rsa/padding.c", 
       "third_party/boringssl/crypto/fipsmodule/rsa/rsa.c", 
       "third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c", 
+      "third_party/boringssl/crypto/fipsmodule/self_check/self_check.c", 
       "third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c", 
       "third_party/boringssl/crypto/fipsmodule/sha/sha1.c", 
       "third_party/boringssl/crypto/fipsmodule/sha/sha256.c", 
       "third_party/boringssl/crypto/fipsmodule/sha/sha512.c", 
+      "third_party/boringssl/crypto/fipsmodule/tls/internal.h", 
+      "third_party/boringssl/crypto/fipsmodule/tls/kdf.c", 
       "third_party/boringssl/crypto/internal.h", 
       "third_party/boringssl/crypto/obj/obj_dat.h", 
       "third_party/boringssl/crypto/pkcs7/internal.h", 
@@ -7856,7 +7873,9 @@
       "third_party/boringssl/include/openssl/x509_vfy.h", 
       "third_party/boringssl/include/openssl/x509v3.h", 
       "third_party/boringssl/ssl/internal.h", 
-      "third_party/boringssl/third_party/fiat/internal.h"
+      "third_party/boringssl/third_party/fiat/curve25519_tables.h", 
+      "third_party/boringssl/third_party/fiat/internal.h", 
+      "third_party/boringssl/third_party/fiat/p256.c"
     ], 
     "is_filegroup": false, 
     "language": "c", 
@@ -8433,6 +8452,19 @@
     "headers": [], 
     "is_filegroup": false, 
     "language": "c++", 
+    "name": "boringssl_self_test_lib", 
+    "src": [], 
+    "third_party": true, 
+    "type": "lib"
+  }, 
+  {
+    "deps": [
+      "boringssl", 
+      "boringssl_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
     "name": "boringssl_file_test_gtest_lib", 
     "src": [], 
     "third_party": true, 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 23e2223b01..00604f181c 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -6748,6 +6748,32 @@
     "flaky": false, 
     "gtest": true, 
     "language": "c++", 
+    "name": "boringssl_self_test", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
+  {
+    "args": [], 
+    "boringssl": true, 
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "cpu_cost": 1.0, 
+    "defaults": "boringssl", 
+    "exclude_configs": [
+      "asan", 
+      "ubsan"
+    ], 
+    "flaky": false, 
+    "gtest": true, 
+    "language": "c++", 
     "name": "boringssl_file_test_gtest", 
     "platforms": [
       "linux", 
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index 58041365b1..6362afd289 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
 git submodule | awk '{ print $1 }' | sort > "$submodules"
 cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
  5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0)
- a20bb7ff8bb5057065a2e7941249773f9676cf45 third_party/boringssl (heads/chromium-stable)
+ 70ef9596bbcc11353b9bb8d4e91478694dd21439 third_party/boringssl (fips-20170615-704-g70ef9596)
  dcd3e6e6ecddf059adb48fca45bc7346a108bdd9 third_party/boringssl-with-bazel (version_for_cocoapods_10.0-369-gdcd3e6e6)
  30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
  ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)