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 /win-x86_64 | |
| 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 'win-x86_64')
| -rw-r--r-- | win-x86_64/crypto/ec/p256-x86_64-asm.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win-x86_64/crypto/ec/p256-x86_64-asm.asm b/win-x86_64/crypto/ec/p256-x86_64-asm.asm index a2e40758..45df8295 100644 --- a/win-x86_64/crypto/ec/p256-x86_64-asm.asm +++ b/win-x86_64/crypto/ec/p256-x86_64-asm.asm @@ -673,6 +673,8 @@ $L$SEH_begin_ecp_nistz256_from_mont: mov rsi,r9 adc rdx,0 + + sub r8,-1 mov rax,r10 sbb r9,r12 |