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

Unified Diff: third_party/boringssl/linux-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/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
diff --git a/third_party/boringssl/linux-x86_64/crypto/aes/aesni-x86_64.S b/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
similarity index 99%
rename from third_party/boringssl/linux-x86_64/crypto/aes/aesni-x86_64.S
rename to third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
index 2890ccfff11bfbc91ddd3717eda780eb53f29857..b5056f27d5eb7aac390674070c7d4048eae8e3e1 100644
--- a/third_party/boringssl/linux-x86_64/crypto/aes/aesni-x86_64.S
+++ b/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
@@ -1,7 +1,7 @@
#if defined(__x86_64__) && !defined(OPENSSL_NO_ASM)
.text
-.extern OPENSSL_ia32cap_P
-.hidden OPENSSL_ia32cap_P
+.extern OPENSSL_ia32cap_addr
+.hidden OPENSSL_ia32cap_addr
.globl aesni_encrypt
.hidden aesni_encrypt
.type aesni_encrypt,@function
@@ -1087,7 +1087,8 @@ aesni_ctr32_encrypt_blocks:
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)
@@ -3473,7 +3474,8 @@ aesni_cbc_encrypt:
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 .Lcbc_dec_six_or_seven
@@ -3994,10 +3996,11 @@ __aesni_set_encrypt_key:
testq %rdx,%rdx
jz .Lenc_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 .L14rounds

Powered by Google App Engine
This is Rietveld 408576698