Skip to content

Commit

Permalink
Roll src/third_party/boringssl/src 7e5dd25d4..61dedd6
Browse files Browse the repository at this point in the history
https://boringssl.googlesource.com/boringssl/+log/7e5dd25d47face6deb452823ae4f40c4c7ca375a..61dedd681501616de5928fe5c0eac6640d4de0c1

BUG=none

Change-Id: I1076026b3ff031422561e13da7febf0a0ed0bfda
Reviewed-on: https://chromium-review.googlesource.com/909652
Commit-Queue: David Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535572}
  • Loading branch information
davidben authored and Commit Bot committed Feb 8, 2018
1 parent 0af72d2 commit 14a61b5
Show file tree
Hide file tree
Showing 4 changed files with 264 additions and 260 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
'boringssl_revision': '7e5dd25d47face6deb452823ae4f40c4c7ca375a',
'boringssl_revision': '61dedd681501616de5928fe5c0eac6640d4de0c1',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
Expand Down
4 changes: 1 addition & 3 deletions third_party/boringssl/BUILD.generated.gni
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ crypto_sources = [
"src/crypto/cpu-ppc64le.c",
"src/crypto/crypto.c",
"src/crypto/curve25519/spake25519.c",
"src/crypto/curve25519/x25519-x86_64.c",
"src/crypto/dh/check.c",
"src/crypto/dh/dh.c",
"src/crypto/dh/dh_asn1.c",
Expand Down Expand Up @@ -344,6 +343,7 @@ ssl_sources = [
"src/ssl/d1_srtp.cc",
"src/ssl/dtls_method.cc",
"src/ssl/dtls_record.cc",
"src/ssl/handoff.cc",
"src/ssl/handshake.cc",
"src/ssl/handshake_client.cc",
"src/ssl/handshake_server.cc",
Expand Down Expand Up @@ -462,7 +462,6 @@ crypto_sources_linux_x86_64 = [
"linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S",
"linux-x86_64/crypto/fipsmodule/x86_64-mont.S",
"linux-x86_64/crypto/fipsmodule/x86_64-mont5.S",
"src/crypto/curve25519/asm/x25519-asm-x86_64.S",
]

crypto_sources_mac_x86 = [
Expand Down Expand Up @@ -499,7 +498,6 @@ crypto_sources_mac_x86_64 = [
"mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S",
"mac-x86_64/crypto/fipsmodule/x86_64-mont.S",
"mac-x86_64/crypto/fipsmodule/x86_64-mont5.S",
"src/crypto/curve25519/asm/x25519-asm-x86_64.S",
]

crypto_sources_win_x86 = [
Expand Down
Loading

0 comments on commit 14a61b5

Please sign in to comment.