Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1180)

Unified Diff: third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S

Issue 2829743002: Roll src/third_party/boringssl/src bc6a76b0e..777fdd644 (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
diff --git a/third_party/boringssl/mac-x86_64/crypto/aes/aesni-x86_64.S b/third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
similarity index 99%
rename from third_party/boringssl/mac-x86_64/crypto/aes/aesni-x86_64.S
rename to third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
index fd62bc8ce586974f48a660c319be4f1d509c6504..f77b95593e1546d00058095b213ac6bf259df429 100644
--- a/third_party/boringssl/mac-x86_64/crypto/aes/aesni-x86_64.S
+++ b/third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
@@ -1086,7 +1086,8 @@ L$ctr32_bulk:
leaq 7(%r8),%r9
movl %r10d,96+12(%rsp)
bswapl %r9d
- movl _OPENSSL_ia32cap_P+4(%rip),%r10d
+ movq _OPENSSL_ia32cap_addr(%rip),%r10
+ movl 4(%r10),%r10d
xorl %ebp,%r9d
andl $71303168,%r10d
movl %r9d,112+12(%rsp)
@@ -3472,7 +3473,8 @@ L$cbc_decrypt_bulk:
movdqa %xmm5,%xmm14
movdqu 80(%rdi),%xmm7
movdqa %xmm6,%xmm15
- movl _OPENSSL_ia32cap_P+4(%rip),%r9d
+ movq _OPENSSL_ia32cap_addr(%rip),%r9
+ movl 4(%r9),%r9d
cmpq $0x70,%rdx
jbe L$cbc_dec_six_or_seven
@@ -3993,10 +3995,11 @@ __aesni_set_encrypt_key:
testq %rdx,%rdx
jz L$enc_key_ret
- movl $268437504,%r10d
movups (%rdi),%xmm0
xorps %xmm4,%xmm4
- andl _OPENSSL_ia32cap_P+4(%rip),%r10d
+ movq _OPENSSL_ia32cap_addr(%rip),%r10
+ movl 4(%r10),%r10d
+ andl $268437504,%r10d
leaq 16(%rdx),%rax
cmpl $256,%esi
je L$14rounds

Powered by Google App Engine
This is Rietveld 408576698