diff options
| author | Steven Valdez <svaldez@google.com> | 2016-10-07 10:34:51 -0400 |
|---|---|---|
| committer | Steven Valdez <svaldez@google.com> | 2016-10-10 10:12:47 -0400 |
| commit | bb1ceac29bc7a18b94e3da78057dc41aa7071784 (patch) | |
| tree | d2c33595946806d8cbc75201ada3e044382727ce /sources.mk | |
| parent | 7c0d06c221ce9edf44bbf978b909b38a0aee2084 (diff) | |
| download | boringssl-bb1ceac29bc7a18b94e3da78057dc41aa7071784.tar.gz | |
external/boringssl: Sync to 3cbdc346.android-n-mr1-preview-2android-n-mr1-preview-1
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/e34bcc91c07c0bf65ecc53a814d51f5246007150..3cbdc34619daafb9f8527fb9dd27afc8ee7dcf19
This removes android_compat_keywrap.c, as these APIs are now provided
natively by BoringSSL.
Test: cts-tradefed run cts -m CtsLibcoreTestCases -m
CtsLibcoreOkHttpTestCases -a arm64-v8a
Change-Id: I29bce93c45eb5b80fa739667bf6e357e0af03b7f
Diffstat (limited to 'sources.mk')
| -rw-r--r-- | sources.mk | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -15,9 +15,9 @@ # This file is created by generate_build_files.py. Do not edit manually. crypto_sources := \ - android_compat_keywrap.c\ err_data.c\ src/crypto/aes/aes.c\ + src/crypto/aes/key_wrap.c\ src/crypto/aes/mode_wrappers.c\ src/crypto/asn1/a_bitstr.c\ src/crypto/asn1/a_bool.c\ @@ -107,6 +107,7 @@ crypto_sources := \ src/crypto/cpu-arm-linux.c\ src/crypto/cpu-arm.c\ src/crypto/cpu-intel.c\ + src/crypto/cpu-ppc64le.c\ src/crypto/crypto.c\ src/crypto/curve25519/curve25519.c\ src/crypto/curve25519/spake25519.c\ @@ -311,6 +312,10 @@ linux_arm_sources := \ src/crypto/curve25519/asm/x25519-asm-arm.S\ src/crypto/poly1305/poly1305_arm_asm.S\ +linux_ppc64le_sources := \ + linux-ppc64le/crypto/aes/aesp8-ppc.S\ + linux-ppc64le/crypto/modes/ghashp8-ppc.S\ + linux_x86_sources := \ linux-x86/crypto/aes/aes-586.S\ linux-x86/crypto/aes/aesni-x86.S\ |