Index: third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm |
diff --git a/third_party/boringssl/win-x86_64/crypto/aes/aesni-x86_64.asm b/third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm |
similarity index 99% |
rename from third_party/boringssl/win-x86_64/crypto/aes/aesni-x86_64.asm |
rename to third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm |
index d5d454d96f3fe7f04dc1852df74bfaf50016693a..ef8ef26b1c70448450183e42691b8d2208291ec8 100644 |
--- a/third_party/boringssl/win-x86_64/crypto/aes/aesni-x86_64.asm |
+++ b/third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm |
@@ -4,7 +4,7 @@ default rel |
%define ZMMWORD |
section .text code align=64 |
-EXTERN OPENSSL_ia32cap_P |
+EXTERN OPENSSL_ia32cap_addr |
global aesni_encrypt |
ALIGN 16 |
@@ -1195,7 +1195,8 @@ DB 102,15,58,34,232,3 |
lea r9,[7+r8] |
mov DWORD[((96+12))+rsp],r10d |
bswap r9d |
- mov r10d,DWORD[((OPENSSL_ia32cap_P+4))] |
+ mov r10,QWORD[OPENSSL_ia32cap_addr] |
+ mov r10d,DWORD[4+r10] |
xor r9d,ebp |
and r10d,71303168 |
mov DWORD[((112+12))+rsp],r9d |
@@ -3755,7 +3756,8 @@ $L$cbc_decrypt_body: |
movdqa xmm14,xmm5 |
movdqu xmm7,XMMWORD[80+rdi] |
movdqa xmm15,xmm6 |
- mov r9d,DWORD[((OPENSSL_ia32cap_P+4))] |
+ mov r9,QWORD[OPENSSL_ia32cap_addr] |
+ mov r9d,DWORD[4+r9] |
cmp rdx,0x70 |
jbe NEAR $L$cbc_dec_six_or_seven |
@@ -4292,10 +4294,11 @@ DB 0x48,0x83,0xEC,0x08 |
test r8,r8 |
jz NEAR $L$enc_key_ret |
- mov r10d,268437504 |
movups xmm0,XMMWORD[rcx] |
xorps xmm4,xmm4 |
- and r10d,DWORD[((OPENSSL_ia32cap_P+4))] |
+ mov r10,QWORD[OPENSSL_ia32cap_addr] |
+ mov r10d,DWORD[4+r10] |
+ and r10d,268437504 |
lea rax,[16+r8] |
cmp edx,256 |
je NEAR $L$14rounds |