Index: third_party/boringssl/win-x86_64/crypto/fipsmodule/aes-x86_64.asm |
diff --git a/third_party/boringssl/win-x86_64/crypto/aes/aes-x86_64.asm b/third_party/boringssl/win-x86_64/crypto/fipsmodule/aes-x86_64.asm |
similarity index 99% |
rename from third_party/boringssl/win-x86_64/crypto/aes/aes-x86_64.asm |
rename to third_party/boringssl/win-x86_64/crypto/fipsmodule/aes-x86_64.asm |
index 3db1846ec18071b80233840ddaa348fc7066e71f..f40c0feeabff3aa98edb7c327470f8d627ec428b 100644 |
--- a/third_party/boringssl/win-x86_64/crypto/aes/aes-x86_64.asm |
+++ b/third_party/boringssl/win-x86_64/crypto/fipsmodule/aes-x86_64.asm |
@@ -1337,7 +1337,7 @@ $L$SEH_end_asm_AES_set_decrypt_key: |
ALIGN 16 |
global asm_AES_cbc_encrypt |
-EXTERN OPENSSL_ia32cap_P |
+EXTERN OPENSSL_ia32cap_addr |
asm_AES_cbc_encrypt: |
mov QWORD[8+rsp],rdi ;WIN64 prologue |
@@ -1371,7 +1371,8 @@ $L$cbc_prologue: |
cmp r9,0 |
cmove r14,r10 |
- mov r10d,DWORD[OPENSSL_ia32cap_P] |
+ mov r10,QWORD[OPENSSL_ia32cap_addr] |
+ mov r10d,DWORD[r10] |
cmp rdx,512 |
jb NEAR $L$cbc_slow_prologue |
test rdx,15 |