diff options
| author | David Benjamin <davidben@google.com> | 2016-08-11 13:26:41 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-09-12 13:10:03 -0400 |
| commit | f0c4a6c4bbde5229ceb86740703243fe5c436aad (patch) | |
| tree | f55d7d9db657ca3a8a09c2ae5017a40ad92b15cb /sources.mk | |
| parent | c501d144b4305c228a0aaa8b3e291510e3b1235b (diff) | |
| download | boringssl-f0c4a6c4bbde5229ceb86740703243fe5c436aad.tar.gz | |
external/boringssl: Sync to 0e9138d2.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/aa24851515d6280aa1d6a8b1548fe74691df3136..0e9138d295cd556e830dc8b3be735e808680f4bd
This requires some build tweaks:
- trusty's rules.mk builds with BORINGSSL_NO_CXX to suppress the new C++
scopers since they build their version of keymaster without the STL.
- BORINGSSL_ENABLE_RC4_TLS to temporarily keep RC4 in the TLS stack.
Change-Id: Ic688ec5779f649a4912b00fb2b55cba64fb07449
Diffstat (limited to 'sources.mk')
| -rw-r--r-- | sources.mk | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -22,7 +22,6 @@ crypto_sources := \ src/crypto/aes/mode_wrappers.c\ src/crypto/asn1/a_bitstr.c\ src/crypto/asn1/a_bool.c\ - src/crypto/asn1/a_bytes.c\ src/crypto/asn1/a_d2i_fp.c\ src/crypto/asn1/a_dup.c\ src/crypto/asn1/a_enum.c\ @@ -323,7 +322,6 @@ linux_x86_sources := \ linux-x86/crypto/chacha/chacha-x86.S\ linux-x86/crypto/md5/md5-586.S\ linux-x86/crypto/modes/ghash-x86.S\ - linux-x86/crypto/rc4/rc4-586.S\ linux-x86/crypto/sha/sha1-586.S\ linux-x86/crypto/sha/sha256-586.S\ linux-x86/crypto/sha/sha512-586.S\ @@ -343,7 +341,6 @@ linux_x86_64_sources := \ linux-x86_64/crypto/modes/aesni-gcm-x86_64.S\ linux-x86_64/crypto/modes/ghash-x86_64.S\ linux-x86_64/crypto/rand/rdrand-x86_64.S\ - linux-x86_64/crypto/rc4/rc4-x86_64.S\ linux-x86_64/crypto/sha/sha1-x86_64.S\ linux-x86_64/crypto/sha/sha256-x86_64.S\ linux-x86_64/crypto/sha/sha512-x86_64.S\ |