external/boringssl: Sync to 2c45fa0b90f61b27973fa81893e014fc8c8e8999.

This includes the following changes:

https://boringssl.googlesource.com/boringssl/+log/faa539f877432814d0f2de19846eb99f2ea1e207..2c45fa0b90f61b27973fa81893e014fc8c8e8999

Test: BoringSSL CTS Presubmits
Change-Id: Ie6dc40e0c979168ec73fa1165cbc6e6b83793439

8 files changed, 25 insertions, 15 deletions

diff --git a/win-x86_64/crypto/aes/aes-x86_64.asm b/win-x86_64/crypto/fipsmodule/aes-x86_64.asm
index 3db1846e..f40c0fee 100644
--- a/win-x86_64/crypto/aes/aes-x86_64.asm
+++ b/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
diff --git a/win-x86_64/crypto/aes/aesni-x86_64.asm b/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm
index d5d454d9..ef8ef26b 100644
--- a/win-x86_64/crypto/aes/aesni-x86_64.asm
+++ b/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
diff --git a/win-x86_64/crypto/aes/bsaes-x86_64.asm b/win-x86_64/crypto/fipsmodule/bsaes-x86_64.asm
index 9c6d1293..9c6d1293 100644
--- a/win-x86_64/crypto/aes/bsaes-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/bsaes-x86_64.asm
diff --git a/win-x86_64/crypto/md5/md5-x86_64.asm b/win-x86_64/crypto/fipsmodule/md5-x86_64.asm
index 0e9d2c60..0e9d2c60 100644
--- a/win-x86_64/crypto/md5/md5-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/md5-x86_64.asm
diff --git a/win-x86_64/crypto/sha/sha1-x86_64.asm b/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm
index 54845743..8324ab69 100644
--- a/win-x86_64/crypto/sha/sha1-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/sha1-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	sha1_block_data_order
 
@@ -19,9 +19,11 @@ $L$SEH_begin_sha1_block_data_order:
 	mov	rdx,r8
 
 
-	mov	r9d,DWORD[((OPENSSL_ia32cap_P+0))]
-	mov	r8d,DWORD[((OPENSSL_ia32cap_P+4))]
-	mov	r10d,DWORD[((OPENSSL_ia32cap_P+8))]
+	lea	r10,[OPENSSL_ia32cap_addr]
+	mov	r10,QWORD[r10]
+	mov	r9d,DWORD[r10]
+	mov	r8d,DWORD[4+r10]
+	mov	r10d,DWORD[8+r10]
 	test	r8d,512
 	jz	NEAR $L$ialu
 	and	r8d,268435456
diff --git a/win-x86_64/crypto/sha/sha256-x86_64.asm b/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm
index 6e3d1541..68da567d 100644
--- a/win-x86_64/crypto/sha/sha256-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm
@@ -5,7 +5,7 @@ default	rel
 section	.text code align=64
 
 
-EXTERN	OPENSSL_ia32cap_P
+EXTERN	OPENSSL_ia32cap_addr
 global	sha256_block_data_order
 
 ALIGN	16
@@ -19,7 +19,8 @@ $L$SEH_begin_sha256_block_data_order:
 	mov	rdx,r8
 
 
-	lea	r11,[OPENSSL_ia32cap_P]
+	lea	r11,[OPENSSL_ia32cap_addr]
+	mov	r11,QWORD[r11]
 	mov	r9d,DWORD[r11]
 	mov	r10d,DWORD[4+r11]
 	mov	r11d,DWORD[8+r11]
@@ -55,6 +56,7 @@ $L$prologue:
 	mov	r9d,DWORD[20+rdi]
 	mov	r10d,DWORD[24+rdi]
 	mov	r11d,DWORD[28+rdi]
+
 	jmp	NEAR $L$loop
 
 ALIGN	16
diff --git a/win-x86_64/crypto/sha/sha512-x86_64.asm b/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm
index d0d7a43f..1ee43c6c 100644
--- a/win-x86_64/crypto/sha/sha512-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm
@@ -5,7 +5,7 @@ default	rel
 section	.text code align=64
 
 
-EXTERN	OPENSSL_ia32cap_P
+EXTERN	OPENSSL_ia32cap_addr
 global	sha512_block_data_order
 
 ALIGN	16
@@ -19,7 +19,8 @@ $L$SEH_begin_sha512_block_data_order:
 	mov	rdx,r8
 
 
-	lea	r11,[OPENSSL_ia32cap_P]
+	lea	r11,[OPENSSL_ia32cap_addr]
+	mov	r11,QWORD[r11]
 	mov	r9d,DWORD[r11]
 	mov	r10d,DWORD[4+r11]
 	mov	r11d,DWORD[8+r11]
@@ -55,6 +56,7 @@ $L$prologue:
 	mov	r9,QWORD[40+rdi]
 	mov	r10,QWORD[48+rdi]
 	mov	r11,QWORD[56+rdi]
+
 	jmp	NEAR $L$loop
 
 ALIGN	16
diff --git a/win-x86_64/crypto/aes/vpaes-x86_64.asm b/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm
index 3edde9fd..3edde9fd 100644
--- a/win-x86_64/crypto/aes/vpaes-x86_64.asm
+++ b/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm