Index: third_party/boringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S |
diff --git a/third_party/boringssl/linux-x86_64/crypto/aes/aes-x86_64.S b/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S |
similarity index 99% |
rename from third_party/boringssl/linux-x86_64/crypto/aes/aes-x86_64.S |
rename to third_party/boringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S |
index 1a0a5124ac8cf1eafef7538f540d145a900e9fcd..0063c89db63daf8f6a394f1d1171d49e28da8a97 100644 |
--- a/third_party/boringssl/linux-x86_64/crypto/aes/aes-x86_64.S |
+++ b/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aes-x86_64.S |
@@ -1294,8 +1294,8 @@ asm_AES_set_decrypt_key: |
.globl asm_AES_cbc_encrypt |
.hidden asm_AES_cbc_encrypt |
.type asm_AES_cbc_encrypt,@function |
-.extern OPENSSL_ia32cap_P |
-.hidden OPENSSL_ia32cap_P |
+.extern OPENSSL_ia32cap_addr |
+.hidden OPENSSL_ia32cap_addr |
.hidden asm_AES_cbc_encrypt |
asm_AES_cbc_encrypt: |
cmpq $0,%rdx |
@@ -1317,7 +1317,8 @@ asm_AES_cbc_encrypt: |
cmpq $0,%r9 |
cmoveq %r10,%r14 |
- movl OPENSSL_ia32cap_P(%rip),%r10d |
+ movq OPENSSL_ia32cap_addr(%rip),%r10 |
+ movl (%r10),%r10d |
cmpq $512,%rdx |
jb .Lcbc_slow_prologue |
testq $15,%rdx |