Commit f9bcb1e7 authored by Steven Valdez's avatar Steven Valdez Committed by Commit Bot

Roll src/third_party/boringssl/src eb7c3008c..9f0e7cb31

https://boringssl.googlesource.com/boringssl/+log/eb7c3008cc85c9cfedca7690f147f5773483f941..9f0e7cb314ae64234b928fd379381ae9760a9a5f

BUG=none

Change-Id: I0397a3370e57d6ba85d4d7f3162af08f693d5455
Reviewed-on: https://chromium-review.googlesource.com/1014028
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551778}
parent e4f3fcad
...@@ -118,7 +118,7 @@ vars = { ...@@ -118,7 +118,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
'boringssl_revision': 'eb7c3008cc85c9cfedca7690f147f5773483f941', 'boringssl_revision': '9f0e7cb314ae64234b928fd379381ae9760a9a5f',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac # the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -258,6 +258,12 @@ crypto_sources = [ ...@@ -258,6 +258,12 @@ crypto_sources = [
"src/crypto/x509v3/v3_skey.c", "src/crypto/x509v3/v3_skey.c",
"src/crypto/x509v3/v3_sxnet.c", "src/crypto/x509v3/v3_sxnet.c",
"src/crypto/x509v3/v3_utl.c", "src/crypto/x509v3/v3_utl.c",
"src/third_party/fiat/curve25519.c",
"src/third_party/fiat/curve25519_tables.h",
"src/third_party/fiat/internal.h",
]
crypto_headers = [
"src/include/openssl/aead.h", "src/include/openssl/aead.h",
"src/include/openssl/aes.h", "src/include/openssl/aes.h",
"src/include/openssl/arm_arch.h", "src/include/openssl/arm_arch.h",
...@@ -327,16 +333,9 @@ crypto_sources = [ ...@@ -327,16 +333,9 @@ crypto_sources = [
"src/include/openssl/x509.h", "src/include/openssl/x509.h",
"src/include/openssl/x509_vfy.h", "src/include/openssl/x509_vfy.h",
"src/include/openssl/x509v3.h", "src/include/openssl/x509v3.h",
"src/third_party/fiat/curve25519.c",
"src/third_party/fiat/curve25519_tables.h",
"src/third_party/fiat/internal.h",
] ]
ssl_sources = [ ssl_sources = [
"src/include/openssl/dtls1.h",
"src/include/openssl/ssl.h",
"src/include/openssl/ssl3.h",
"src/include/openssl/tls1.h",
"src/ssl/bio_ssl.cc", "src/ssl/bio_ssl.cc",
"src/ssl/custom_extensions.cc", "src/ssl/custom_extensions.cc",
"src/ssl/d1_both.cc", "src/ssl/d1_both.cc",
...@@ -377,6 +376,13 @@ ssl_sources = [ ...@@ -377,6 +376,13 @@ ssl_sources = [
"src/ssl/tls_record.cc", "src/ssl/tls_record.cc",
] ]
ssl_headers = [
"src/include/openssl/dtls1.h",
"src/include/openssl/ssl.h",
"src/include/openssl/ssl3.h",
"src/include/openssl/tls1.h",
]
crypto_sources_ios_aarch64 = [ crypto_sources_ios_aarch64 = [
"ios-aarch64/crypto/chacha/chacha-armv8.S", "ios-aarch64/crypto/chacha/chacha-armv8.S",
"ios-aarch64/crypto/fipsmodule/aesv8-armx64.S", "ios-aarch64/crypto/fipsmodule/aesv8-armx64.S",
......
...@@ -45,6 +45,7 @@ config("no_asm_config") { ...@@ -45,6 +45,7 @@ config("no_asm_config") {
} }
all_sources = crypto_sources + ssl_sources all_sources = crypto_sources + ssl_sources
all_headers = crypto_headers + ssl_headers
# Windows' assembly is built with Yasm. The other platforms use the platform # Windows' assembly is built with Yasm. The other platforms use the platform
# assembler. # assembler.
...@@ -108,6 +109,11 @@ if (is_win && !is_msan) { ...@@ -108,6 +109,11 @@ if (is_win && !is_msan) {
component("boringssl") { component("boringssl") {
sources = all_sources sources = all_sources
public = all_headers
friend = [
":boringssl_crypto_tests",
":boringssl_ssl_tests",
]
deps = [ deps = [
":boringssl_asm", ":boringssl_asm",
"//third_party/boringssl/src/third_party/fiat:fiat_license", "//third_party/boringssl/src/third_party/fiat:fiat_license",
...@@ -216,6 +222,8 @@ if (build_with_chromium) { ...@@ -216,6 +222,8 @@ if (build_with_chromium) {
fuzzer_test("boringssl_${fuzzer}_fuzzer") { fuzzer_test("boringssl_${fuzzer}_fuzzer") {
sources = [ sources = [
"src/fuzz/${fuzzer}.cc", "src/fuzz/${fuzzer}.cc",
"src/ssl/test/fuzzer.h",
"src/ssl/test/fuzzer_tags.h",
] ]
deps = [ deps = [
":boringssl_fuzzer", ":boringssl_fuzzer",
...@@ -275,6 +283,8 @@ if (build_with_chromium) { ...@@ -275,6 +283,8 @@ if (build_with_chromium) {
fuzzer_test("boringssl_client_no_fuzzer_mode_fuzzer") { fuzzer_test("boringssl_client_no_fuzzer_mode_fuzzer") {
sources = [ sources = [
"src/fuzz/client.cc", "src/fuzz/client.cc",
"src/ssl/test/fuzzer.h",
"src/ssl/test/fuzzer_tags.h",
] ]
deps = [ deps = [
":boringssl_fuzzer_no_fuzzer_mode", ":boringssl_fuzzer_no_fuzzer_mode",
...@@ -285,6 +295,8 @@ if (build_with_chromium) { ...@@ -285,6 +295,8 @@ if (build_with_chromium) {
fuzzer_test("boringssl_server_no_fuzzer_mode_fuzzer") { fuzzer_test("boringssl_server_no_fuzzer_mode_fuzzer") {
sources = [ sources = [
"src/fuzz/server.cc", "src/fuzz/server.cc",
"src/ssl/test/fuzzer.h",
"src/ssl/test/fuzzer_tags.h",
] ]
deps = [ deps = [
":boringssl_fuzzer_no_fuzzer_mode", ":boringssl_fuzzer_no_fuzzer_mode",
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment