diff options
| author | Robert Sloan <varomodt@google.com> | 2017-05-01 07:46:28 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-05-01 07:46:37 -0700 |
| commit | 2424d84dd6dbdc0d32a4c80e6810d168f722ce0b (patch) | |
| tree | 8727f96cb5c16125aa208b34cea46fe26473dcb1 /mac-x86_64 | |
| parent | 9254e681d446a8105bd66f08bae1252d4d89a139 (diff) | |
| download | boringssl-2424d84dd6dbdc0d32a4c80e6810d168f722ce0b.tar.gz | |
external/boringssl: Sync to 58e449904e248f34bdfc2be7a609c58bcb0257b7.android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/2c1523733a71166943e52da11ac2eae82b0227b8..58e449904e248f34bdfc2be7a609c58bcb0257b7
Test: BoringSSL CTS Presubmits
Change-Id: I1a825139c8c7076d09b8a3acc5f09a547a7cbe0d
Diffstat (limited to 'mac-x86_64')
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/aes-x86_64.S | 2 | ||||
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/aesni-x86_64.S | 6 | ||||
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/ghash-x86_64.S | 2 | ||||
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/sha1-x86_64.S | 3 | ||||
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/sha256-x86_64.S | 3 | ||||
| -rw-r--r-- | mac-x86_64/crypto/fipsmodule/sha512-x86_64.S | 3 |
6 files changed, 8 insertions, 11 deletions
diff --git a/mac-x86_64/crypto/fipsmodule/aes-x86_64.S b/mac-x86_64/crypto/fipsmodule/aes-x86_64.S index 891861ce..c7c4829f 100644 --- a/mac-x86_64/crypto/fipsmodule/aes-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/aes-x86_64.S @@ -1316,7 +1316,7 @@ L$cbc_prologue: cmpq $0,%r9 cmoveq %r10,%r14 - movq _OPENSSL_ia32cap_addr(%rip),%r10 + leaq _OPENSSL_ia32cap_P(%rip),%r10 movl (%r10),%r10d cmpq $512,%rdx jb L$cbc_slow_prologue diff --git a/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S b/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S index f77b9559..4ee0dc49 100644 --- a/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S @@ -1086,7 +1086,7 @@ L$ctr32_bulk: leaq 7(%r8),%r9 movl %r10d,96+12(%rsp) bswapl %r9d - movq _OPENSSL_ia32cap_addr(%rip),%r10 + leaq _OPENSSL_ia32cap_P(%rip),%r10 movl 4(%r10),%r10d xorl %ebp,%r9d andl $71303168,%r10d @@ -3473,7 +3473,7 @@ L$cbc_decrypt_bulk: movdqa %xmm5,%xmm14 movdqu 80(%rdi),%xmm7 movdqa %xmm6,%xmm15 - movq _OPENSSL_ia32cap_addr(%rip),%r9 + leaq _OPENSSL_ia32cap_P(%rip),%r9 movl 4(%r9),%r9d cmpq $0x70,%rdx jbe L$cbc_dec_six_or_seven @@ -3997,7 +3997,7 @@ __aesni_set_encrypt_key: movups (%rdi),%xmm0 xorps %xmm4,%xmm4 - movq _OPENSSL_ia32cap_addr(%rip),%r10 + leaq _OPENSSL_ia32cap_P(%rip),%r10 movl 4(%r10),%r10d andl $268437504,%r10d leaq 16(%rdx),%rax diff --git a/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S b/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S index d47f061c..78b88cc2 100644 --- a/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S @@ -889,7 +889,7 @@ L$_ghash_clmul: jz L$odd_tail movdqu 16(%rsi),%xmm6 - movq _OPENSSL_ia32cap_addr(%rip),%rax + leaq _OPENSSL_ia32cap_P(%rip),%rax movl 4(%rax),%eax cmpq $0x30,%rcx jb L$skip4x diff --git a/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S b/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S index e5eb4c75..c22431c8 100644 --- a/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S @@ -7,8 +7,7 @@ .p2align 4 _sha1_block_data_order: - leaq _OPENSSL_ia32cap_addr(%rip),%r10 - movq (%r10),%r10 + leaq _OPENSSL_ia32cap_P(%rip),%r10 movl 0(%r10),%r9d movl 4(%r10),%r8d movl 8(%r10),%r10d diff --git a/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S b/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S index 7699b541..9b9c94ac 100644 --- a/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S @@ -7,8 +7,7 @@ .p2align 4 _sha256_block_data_order: - leaq _OPENSSL_ia32cap_addr(%rip),%r11 - movq (%r11),%r11 + leaq _OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d movl 8(%r11),%r11d diff --git a/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S b/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S index e84bde75..05d0174b 100644 --- a/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S +++ b/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S @@ -7,8 +7,7 @@ .p2align 4 _sha512_block_data_order: - leaq _OPENSSL_ia32cap_addr(%rip),%r11 - movq (%r11),%r11 + leaq _OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d movl 8(%r11),%r11d |