Roll src/third_party/boringssl/src 11a7b3c2d..b8d74f5b6

third_party/boringssl/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build_overrides/build.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("BUILD.generated.gni")
 import("BUILD.generated_tests.gni")
@@ skipping 23 matching lines @@
     cflags_c = [ "-std=c99" ]
     defines += [ "_XOPEN_SOURCE=700" ]
   }
 }
 
 config("no_asm_config") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   defines = [ "OPENSSL_NO_ASM" ]
 }
 
-config("fuzzer_config") {
-  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-  defines = [ "BORINGSSL_UNSAFE_FUZZER_MODE" ]
-}
-
 all_sources = crypto_sources + ssl_sources
 
 # Windows' assembly is built with Yasm. The other platforms use the platform
 # assembler.
 if (is_win && !is_msan) {
   import("//third_party/yasm/yasm_assemble.gni")
   yasm_assemble("boringssl_asm") {
     if (current_cpu == "x64") {
       sources = crypto_sources_win_x86_64
     } else if (current_cpu == "x86") {
@@ skipping 90 matching lines @@
         "//base/test:run_all_unittests",
         "//base/test:test_support",
         "//testing/gtest",
       ]
       sources = [
         "boringssl_unittest.cc",
       ]
     }
   }
 
+  config("fuzzer_config") {
+    visibility = [ ":*" ]  # Only targets in this file can depend on this.
+    defines = [
+      "BORINGSSL_UNSAFE_FUZZER_MODE",
+      "BORINGSSL_UNSAFE_DETERMINISTIC_MODE",
+    ]
+  }
+
   # The same as boringssl, but builds with BORINGSSL_UNSAFE_FUZZER_MODE.
   component("boringssl_fuzzer") {
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
     sources = all_sources
     deps = [
       ":boringssl_asm",
     ]
 
     public_configs = [
@@ skipping 32 matching lines @@
         libfuzzer_options = [ "max_len=512" ]
       } else if ("server" == fuzzer) {
         libfuzzer_options = [ "max_len=4096" ]
       } else if ("spki" == fuzzer) {
         libfuzzer_options = [ "max_len=1024" ]
       } else if ("ssl_ctx_api" == fuzzer) {
         libfuzzer_options = [ "max_len=256" ]
       }
     }
   }
+
+  config("fuzzer_no_fuzzer_mode_config") {
+    visibility = [ ":*" ]  # Only targets in this file can depend on this.
+    defines = [ "BORINGSSL_UNSAFE_DETERMINISTIC_MODE" ]
+  }
+
+  # The same as boringssl, but builds with BORINGSSL_UNSAFE_DETERMINISTIC_MODE.
+  component("boringssl_fuzzer_no_fuzzer_mode") {
+    visibility = [ ":*" ]  # Only targets in this file can depend on this.
+
+    sources = all_sources
+    deps = [
+      ":boringssl_asm",
+    ]
+
+    public_configs = [
+      ":external_config",
+      ":fuzzer_no_fuzzer_mode_config",
+    ]
+    configs += [ ":internal_config" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    if (is_nacl) {
+      deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    }
+  }
+
+  fuzzer_test("boringssl_client_no_fuzzer_mode_fuzzer") {
+    sources = [
+      "src/fuzz/client.cc",
+    ]
+    deps = [
+      ":boringssl_fuzzer_no_fuzzer_mode",
+    ]
+    seed_corpus = "src/fuzz/client_corpus_no_fuzzer_mode"
+  }
+
+  fuzzer_test("boringssl_server_no_fuzzer_mode_fuzzer") {
+    sources = [
+      "src/fuzz/server.cc",
+    ]
+    deps = [
+      ":boringssl_fuzzer_no_fuzzer_mode",
+    ]
+    seed_corpus = "src/fuzz/server_corpus_no_fuzzer_mode"
+  }
 }