Roll src/third_party/boringssl/src 63fa118f3..e189c86bc

https://boringssl.googlesource.com/boringssl/+log/63fa118f3a3d065adb6ca17227bb9e407ffadccb..e189c86bc75066ce675d076375062947f7cf1217

BUG=none

Review URL: https://codereview.chromium.org/1429533002

Cr-Commit-Position: refs/heads/master@{#356326}

6 files changed, 75 insertions, 1189 deletions

diff --git a/third_party/boringssl/linux-x86/crypto/sha/sha1-586.S b/third_party/boringssl/linux-x86/crypto/sha/sha1-586.S
index 808ccac..dd86f31 100644
--- a/third_party/boringssl/linux-x86/crypto/sha/sha1-586.S
+++ b/third_party/boringssl/linux-x86/crypto/sha/sha1-586.S
@@ -23,8 +23,6 @@ sha1_block_data_order:
 	movl	8(%esi),%ecx
 	testl	$16777216,%eax
 	jz	.L001x86
-	testl	$536870912,%ecx
-	jnz	.Lshaext_shortcut
 	jmp	.Lssse3_shortcut
 .align	16
 .L001x86:
@@ -1393,177 +1391,6 @@ sha1_block_data_order:
 	popl	%ebp
 	ret
 .size	sha1_block_data_order,.-.L_sha1_block_data_order_begin
-.hidden	_sha1_block_data_order_shaext
-.type	_sha1_block_data_order_shaext,@function
-.align	16
-_sha1_block_data_order_shaext:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	call	.L003pic_point
-.L003pic_point:
-	popl	%ebp
-	leal	.LK_XX_XX-.L003pic_point(%ebp),%ebp
-.Lshaext_shortcut:
-	movl	20(%esp),%edi
-	movl	%esp,%ebx
-	movl	24(%esp),%esi
-	movl	28(%esp),%ecx
-	subl	$32,%esp
-	movdqu	(%edi),%xmm0
-	movd	16(%edi),%xmm1
-	andl	$-32,%esp
-	movdqa	80(%ebp),%xmm3
-	movdqu	(%esi),%xmm4
-	pshufd	$27,%xmm0,%xmm0
-	movdqu	16(%esi),%xmm5
-	pshufd	$27,%xmm1,%xmm1
-	movdqu	32(%esi),%xmm6
-.byte	102,15,56,0,227
-	movdqu	48(%esi),%xmm7
-.byte	102,15,56,0,235
-.byte	102,15,56,0,243
-.byte	102,15,56,0,251
-	jmp	.L004loop_shaext
-.align	16
-.L004loop_shaext:
-	decl	%ecx
-	leal	64(%esi),%eax
-	movdqa	%xmm1,(%esp)
-	paddd	%xmm4,%xmm1
-	cmovnel	%eax,%esi
-	movdqa	%xmm0,16(%esp)
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,0
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,0
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,1
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,1
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,2
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,2
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-	movdqu	(%esi),%xmm4
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,3
-.byte	15,56,200,213
-	movdqu	16(%esi),%xmm5
-.byte	102,15,56,0,227
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-.byte	15,56,200,206
-	movdqu	32(%esi),%xmm6
-.byte	102,15,56,0,235
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,3
-.byte	15,56,200,215
-	movdqu	48(%esi),%xmm7
-.byte	102,15,56,0,243
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-	movdqa	(%esp),%xmm2
-.byte	102,15,56,0,251
-.byte	15,56,200,202
-	paddd	16(%esp),%xmm0
-	jnz	.L004loop_shaext
-	pshufd	$27,%xmm0,%xmm0
-	pshufd	$27,%xmm1,%xmm1
-	movdqu	%xmm0,(%edi)
-	movd	%xmm1,16(%edi)
-	movl	%ebx,%esp
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	_sha1_block_data_order_shaext,.-_sha1_block_data_order_shaext
 .hidden	_sha1_block_data_order_ssse3
 .type	_sha1_block_data_order_ssse3,@function
 .align	16
@@ -1572,10 +1399,10 @@ _sha1_block_data_order_ssse3:
 	pushl	%ebx
 	pushl	%esi
 	pushl	%edi
-	call	.L005pic_point
-.L005pic_point:
+	call	.L003pic_point
+.L003pic_point:
 	popl	%ebp
-	leal	.LK_XX_XX-.L005pic_point(%ebp),%ebp
+	leal	.LK_XX_XX-.L003pic_point(%ebp),%ebp
 .Lssse3_shortcut:
 	movdqa	(%ebp),%xmm7
 	movdqa	16(%ebp),%xmm0
@@ -1628,9 +1455,9 @@ _sha1_block_data_order_ssse3:
 	xorl	%edx,%ebp
 	pshufd	$238,%xmm0,%xmm4
 	andl	%ebp,%esi
-	jmp	.L006loop
+	jmp	.L004loop
 .align	16
-.L006loop:
+.L004loop:
 	rorl	$2,%ebx
 	xorl	%edx,%esi
 	movl	%eax,%ebp
@@ -2533,7 +2360,7 @@ _sha1_block_data_order_ssse3:
 	addl	%edx,%ecx
 	movl	196(%esp),%ebp
 	cmpl	200(%esp),%ebp
-	je	.L007done
+	je	.L005done
 	movdqa	160(%esp),%xmm7
 	movdqa	176(%esp),%xmm6
 	movdqu	(%ebp),%xmm0
@@ -2668,9 +2495,9 @@ _sha1_block_data_order_ssse3:
 	pshufd	$238,%xmm0,%xmm4
 	andl	%ebx,%esi
 	movl	%ebp,%ebx
-	jmp	.L006loop
+	jmp	.L004loop
 .align	16
-.L007done:
+.L005done:
 	addl	16(%esp),%ebx
 	xorl	%edi,%esi
 	movl	%ecx,%ebp
diff --git a/third_party/boringssl/linux-x86/crypto/sha/sha256-586.S b/third_party/boringssl/linux-x86/crypto/sha/sha256-586.S
index 08d9484..196f7f9 100644
--- a/third_party/boringssl/linux-x86/crypto/sha/sha256-586.S
+++ b/third_party/boringssl/linux-x86/crypto/sha/sha256-586.S
@@ -37,17 +37,15 @@ sha256_block_data_order:
 	jz	.L003no_xmm
 	andl	$1073741824,%ecx
 	andl	$268435968,%ebx
-	testl	$536870912,%edx
-	jnz	.L004shaext
 	orl	%ebx,%ecx
 	andl	$1342177280,%ecx
 	cmpl	$1342177280,%ecx
 	testl	$512,%ebx
-	jnz	.L005SSSE3
+	jnz	.L004SSSE3
 .L003no_xmm:
 	subl	%edi,%eax
 	cmpl	$256,%eax
-	jae	.L006unrolled
+	jae	.L005unrolled
 	jmp	.L002loop
 .align	16
 .L002loop:
@@ -119,7 +117,7 @@ sha256_block_data_order:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	16
-.L00700_15:
+.L00600_15:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	rorl	$14,%ecx
@@ -157,11 +155,11 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	.L00700_15
+	jne	.L00600_15
 	movl	156(%esp),%ecx
-	jmp	.L00816_63
+	jmp	.L00716_63
 .align	16
-.L00816_63:
+.L00716_63:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	rorl	$11,%ecx
@@ -216,7 +214,7 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	.L00816_63
+	jne	.L00716_63
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -260,7 +258,7 @@ sha256_block_data_order:
 .byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
 .byte	62,0
 .align	16
-.L006unrolled:
+.L005unrolled:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebp
@@ -277,9 +275,9 @@ sha256_block_data_order:
 	movl	%ebx,20(%esp)
 	movl	%ecx,24(%esp)
 	movl	%esi,28(%esp)
-	jmp	.L009grand_loop
+	jmp	.L008grand_loop
 .align	16
-.L009grand_loop:
+.L008grand_loop:
 	movl	(%edi),%ebx
 	movl	4(%edi),%ecx
 	bswap	%ebx
@@ -3159,7 +3157,7 @@ sha256_block_data_order:
 	movl	%ebx,24(%esp)
 	movl	%ecx,28(%esp)
 	cmpl	104(%esp),%edi
-	jb	.L009grand_loop
+	jb	.L008grand_loop
 	movl	108(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -3167,205 +3165,7 @@ sha256_block_data_order:
 	popl	%ebp
 	ret
 .align	32
-.L004shaext:
-	subl	$32,%esp
-	movdqu	(%esi),%xmm1
-	leal	128(%ebp),%ebp
-	movdqu	16(%esi),%xmm2
-	movdqa	128(%ebp),%xmm7
-	pshufd	$27,%xmm1,%xmm0
-	pshufd	$177,%xmm1,%xmm1
-	pshufd	$27,%xmm2,%xmm2
-.byte	102,15,58,15,202,8
-	punpcklqdq	%xmm0,%xmm2
-	jmp	.L010loop_shaext
-.align	16
-.L010loop_shaext:
-	movdqu	(%edi),%xmm3
-	movdqu	16(%edi),%xmm4
-	movdqu	32(%edi),%xmm5
-.byte	102,15,56,0,223
-	movdqu	48(%edi),%xmm6
-	movdqa	%xmm2,16(%esp)
-	movdqa	-128(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	102,15,56,0,231
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	nop
-	movdqa	%xmm1,(%esp)
-.byte	15,56,203,202
-	movdqa	-112(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	102,15,56,0,239
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	leal	64(%edi),%edi
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	-96(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	102,15,56,0,247
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	-80(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	-64(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	-48(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-	nop
-	paddd	%xmm7,%xmm6
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	-32(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,205,245
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	-16(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	16(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-	nop
-	paddd	%xmm7,%xmm6
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	32(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,205,245
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	48(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	64(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	80(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-.byte	15,56,203,202
-	paddd	%xmm7,%xmm6
-	movdqa	96(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-.byte	15,56,205,245
-	movdqa	128(%ebp),%xmm7
-.byte	15,56,203,202
-	movdqa	112(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-	nop
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	cmpl	%edi,%eax
-	nop
-.byte	15,56,203,202
-	paddd	16(%esp),%xmm2
-	paddd	(%esp),%xmm1
-	jnz	.L010loop_shaext
-	pshufd	$177,%xmm2,%xmm2
-	pshufd	$27,%xmm1,%xmm7
-	pshufd	$177,%xmm1,%xmm1
-	punpckhqdq	%xmm2,%xmm1
-.byte	102,15,58,15,215,8
-	movl	44(%esp),%esp
-	movdqu	%xmm1,(%esi)
-	movdqu	%xmm2,16(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	32
-.L005SSSE3:
+.L004SSSE3:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebx
@@ -3384,9 +3184,9 @@ sha256_block_data_order:
 	movl	%ecx,24(%esp)
 	movl	%esi,28(%esp)
 	movdqa	256(%ebp),%xmm7
-	jmp	.L011grand_ssse3
+	jmp	.L009grand_ssse3
 .align	16
-.L011grand_ssse3:
+.L009grand_ssse3:
 	movdqu	(%edi),%xmm0
 	movdqu	16(%edi),%xmm1
 	movdqu	32(%edi),%xmm2
@@ -3409,9 +3209,9 @@ sha256_block_data_order:
 	paddd	%xmm3,%xmm7
 	movdqa	%xmm6,64(%esp)
 	movdqa	%xmm7,80(%esp)
-	jmp	.L012ssse3_00_47
+	jmp	.L010ssse3_00_47
 .align	16
-.L012ssse3_00_47:
+.L010ssse3_00_47:
 	addl	$64,%ebp
 	movl	%edx,%ecx
 	movdqa	%xmm1,%xmm4
@@ -4054,7 +3854,7 @@ sha256_block_data_order:
 	addl	%ecx,%eax
 	movdqa	%xmm6,80(%esp)
 	cmpl	$66051,64(%ebp)
-	jne	.L012ssse3_00_47
+	jne	.L010ssse3_00_47
 	movl	%edx,%ecx
 	rorl	$14,%edx
 	movl	20(%esp),%esi
@@ -4568,7 +4368,7 @@ sha256_block_data_order:
 	movdqa	64(%ebp),%xmm7
 	subl	$192,%ebp
 	cmpl	104(%esp),%edi
-	jb	.L011grand_ssse3
+	jb	.L009grand_ssse3
 	movl	108(%esp),%esp
 	popl	%edi
 	popl	%esi
diff --git a/third_party/boringssl/mac-x86/crypto/sha/sha1-586.S b/third_party/boringssl/mac-x86/crypto/sha/sha1-586.S
index 97aafbf..f880e7e 100644
--- a/third_party/boringssl/mac-x86/crypto/sha/sha1-586.S
+++ b/third_party/boringssl/mac-x86/crypto/sha/sha1-586.S
@@ -22,8 +22,6 @@ L000pic_point:
 	movl	8(%esi),%ecx
 	testl	$16777216,%eax
 	jz	L001x86
-	testl	$536870912,%ecx
-	jnz	Lshaext_shortcut
 	jmp	Lssse3_shortcut
 .align	4,0x90
 L001x86:
@@ -1391,9 +1389,9 @@ L002loop:
 	popl	%ebx
 	popl	%ebp
 	ret
-.private_extern	__sha1_block_data_order_shaext
+.private_extern	__sha1_block_data_order_ssse3
 .align	4
-__sha1_block_data_order_shaext:
+__sha1_block_data_order_ssse3:
 	pushl	%ebp
 	pushl	%ebx
 	pushl	%esi
@@ -1402,175 +1400,6 @@ __sha1_block_data_order_shaext:
 L003pic_point:
 	popl	%ebp
 	leal	LK_XX_XX-L003pic_point(%ebp),%ebp
-Lshaext_shortcut:
-	movl	20(%esp),%edi
-	movl	%esp,%ebx
-	movl	24(%esp),%esi
-	movl	28(%esp),%ecx
-	subl	$32,%esp
-	movdqu	(%edi),%xmm0
-	movd	16(%edi),%xmm1
-	andl	$-32,%esp
-	movdqa	80(%ebp),%xmm3
-	movdqu	(%esi),%xmm4
-	pshufd	$27,%xmm0,%xmm0
-	movdqu	16(%esi),%xmm5
-	pshufd	$27,%xmm1,%xmm1
-	movdqu	32(%esi),%xmm6
-.byte	102,15,56,0,227
-	movdqu	48(%esi),%xmm7
-.byte	102,15,56,0,235
-.byte	102,15,56,0,243
-.byte	102,15,56,0,251
-	jmp	L004loop_shaext
-.align	4,0x90
-L004loop_shaext:
-	decl	%ecx
-	leal	64(%esi),%eax
-	movdqa	%xmm1,(%esp)
-	paddd	%xmm4,%xmm1
-	cmovnel	%eax,%esi
-	movdqa	%xmm0,16(%esp)
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,0
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,0
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,0
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,1
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,1
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,1
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,2
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-.byte	15,56,201,229
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,213
-	pxor	%xmm6,%xmm4
-.byte	15,56,201,238
-.byte	15,56,202,231
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,2
-.byte	15,56,200,206
-	pxor	%xmm7,%xmm5
-.byte	15,56,202,236
-.byte	15,56,201,247
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,2
-.byte	15,56,200,215
-	pxor	%xmm4,%xmm6
-.byte	15,56,201,252
-.byte	15,56,202,245
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-.byte	15,56,200,204
-	pxor	%xmm5,%xmm7
-.byte	15,56,202,254
-	movdqu	(%esi),%xmm4
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,3
-.byte	15,56,200,213
-	movdqu	16(%esi),%xmm5
-.byte	102,15,56,0,227
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-.byte	15,56,200,206
-	movdqu	32(%esi),%xmm6
-.byte	102,15,56,0,235
-	movdqa	%xmm0,%xmm2
-.byte	15,58,204,193,3
-.byte	15,56,200,215
-	movdqu	48(%esi),%xmm7
-.byte	102,15,56,0,243
-	movdqa	%xmm0,%xmm1
-.byte	15,58,204,194,3
-	movdqa	(%esp),%xmm2
-.byte	102,15,56,0,251
-.byte	15,56,200,202
-	paddd	16(%esp),%xmm0
-	jnz	L004loop_shaext
-	pshufd	$27,%xmm0,%xmm0
-	pshufd	$27,%xmm1,%xmm1
-	movdqu	%xmm0,(%edi)
-	movd	%xmm1,16(%edi)
-	movl	%ebx,%esp
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.private_extern	__sha1_block_data_order_ssse3
-.align	4
-__sha1_block_data_order_ssse3:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	call	L005pic_point
-L005pic_point:
-	popl	%ebp
-	leal	LK_XX_XX-L005pic_point(%ebp),%ebp
 Lssse3_shortcut:
 	movdqa	(%ebp),%xmm7
 	movdqa	16(%ebp),%xmm0
@@ -1623,9 +1452,9 @@ Lssse3_shortcut:
 	xorl	%edx,%ebp
 	pshufd	$238,%xmm0,%xmm4
 	andl	%ebp,%esi
-	jmp	L006loop
+	jmp	L004loop
 .align	4,0x90
-L006loop:
+L004loop:
 	rorl	$2,%ebx
 	xorl	%edx,%esi
 	movl	%eax,%ebp
@@ -2528,7 +2357,7 @@ L006loop:
 	addl	%edx,%ecx
 	movl	196(%esp),%ebp
 	cmpl	200(%esp),%ebp
-	je	L007done
+	je	L005done
 	movdqa	160(%esp),%xmm7
 	movdqa	176(%esp),%xmm6
 	movdqu	(%ebp),%xmm0
@@ -2663,9 +2492,9 @@ L006loop:
 	pshufd	$238,%xmm0,%xmm4
 	andl	%ebx,%esi
 	movl	%ebp,%ebx
-	jmp	L006loop
+	jmp	L004loop
 .align	4,0x90
-L007done:
+L005done:
 	addl	16(%esp),%ebx
 	xorl	%edi,%esi
 	movl	%ecx,%ebp
diff --git a/third_party/boringssl/mac-x86/crypto/sha/sha256-586.S b/third_party/boringssl/mac-x86/crypto/sha/sha256-586.S
index f0ba612..4615588 100644
--- a/third_party/boringssl/mac-x86/crypto/sha/sha256-586.S
+++ b/third_party/boringssl/mac-x86/crypto/sha/sha256-586.S
@@ -36,17 +36,15 @@ L000pic_point:
 	jz	L003no_xmm
 	andl	$1073741824,%ecx
 	andl	$268435968,%ebx
-	testl	$536870912,%edx
-	jnz	L004shaext
 	orl	%ebx,%ecx
 	andl	$1342177280,%ecx
 	cmpl	$1342177280,%ecx
 	testl	$512,%ebx
-	jnz	L005SSSE3
+	jnz	L004SSSE3
 L003no_xmm:
 	subl	%edi,%eax
 	cmpl	$256,%eax
-	jae	L006unrolled
+	jae	L005unrolled
 	jmp	L002loop
 .align	4,0x90
 L002loop:
@@ -118,7 +116,7 @@ L002loop:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	4,0x90
-L00700_15:
+L00600_15:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	rorl	$14,%ecx
@@ -156,11 +154,11 @@ L00700_15:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	L00700_15
+	jne	L00600_15
 	movl	156(%esp),%ecx
-	jmp	L00816_63
+	jmp	L00716_63
 .align	4,0x90
-L00816_63:
+L00716_63:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	rorl	$11,%ecx
@@ -215,7 +213,7 @@ L00816_63:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	L00816_63
+	jne	L00716_63
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -259,7 +257,7 @@ L001K256:
 .byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
 .byte	62,0
 .align	4,0x90
-L006unrolled:
+L005unrolled:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebp
@@ -276,9 +274,9 @@ L006unrolled:
 	movl	%ebx,20(%esp)
 	movl	%ecx,24(%esp)
 	movl	%esi,28(%esp)
-	jmp	L009grand_loop
+	jmp	L008grand_loop
 .align	4,0x90
-L009grand_loop:
+L008grand_loop:
 	movl	(%edi),%ebx
 	movl	4(%edi),%ecx
 	bswap	%ebx
@@ -3158,7 +3156,7 @@ L009grand_loop:
 	movl	%ebx,24(%esp)
 	movl	%ecx,28(%esp)
 	cmpl	104(%esp),%edi
-	jb	L009grand_loop
+	jb	L008grand_loop
 	movl	108(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -3166,205 +3164,7 @@ L009grand_loop:
 	popl	%ebp
 	ret
 .align	5,0x90
-L004shaext:
-	subl	$32,%esp
-	movdqu	(%esi),%xmm1
-	leal	128(%ebp),%ebp
-	movdqu	16(%esi),%xmm2
-	movdqa	128(%ebp),%xmm7
-	pshufd	$27,%xmm1,%xmm0
-	pshufd	$177,%xmm1,%xmm1
-	pshufd	$27,%xmm2,%xmm2
-.byte	102,15,58,15,202,8
-	punpcklqdq	%xmm0,%xmm2
-	jmp	L010loop_shaext
-.align	4,0x90
-L010loop_shaext:
-	movdqu	(%edi),%xmm3
-	movdqu	16(%edi),%xmm4
-	movdqu	32(%edi),%xmm5
-.byte	102,15,56,0,223
-	movdqu	48(%edi),%xmm6
-	movdqa	%xmm2,16(%esp)
-	movdqa	-128(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	102,15,56,0,231
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	nop
-	movdqa	%xmm1,(%esp)
-.byte	15,56,203,202
-	movdqa	-112(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	102,15,56,0,239
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	leal	64(%edi),%edi
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	-96(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	102,15,56,0,247
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	-80(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	-64(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	-48(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-	nop
-	paddd	%xmm7,%xmm6
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	-32(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,205,245
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	-16(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	16(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-	nop
-	paddd	%xmm7,%xmm6
-.byte	15,56,204,220
-.byte	15,56,203,202
-	movdqa	32(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,205,245
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm6,%xmm7
-.byte	102,15,58,15,253,4
-	nop
-	paddd	%xmm7,%xmm3
-.byte	15,56,204,229
-.byte	15,56,203,202
-	movdqa	48(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-.byte	15,56,205,222
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm3,%xmm7
-.byte	102,15,58,15,254,4
-	nop
-	paddd	%xmm7,%xmm4
-.byte	15,56,204,238
-.byte	15,56,203,202
-	movdqa	64(%ebp),%xmm0
-	paddd	%xmm3,%xmm0
-.byte	15,56,205,227
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm4,%xmm7
-.byte	102,15,58,15,251,4
-	nop
-	paddd	%xmm7,%xmm5
-.byte	15,56,204,243
-.byte	15,56,203,202
-	movdqa	80(%ebp),%xmm0
-	paddd	%xmm4,%xmm0
-.byte	15,56,205,236
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	movdqa	%xmm5,%xmm7
-.byte	102,15,58,15,252,4
-.byte	15,56,203,202
-	paddd	%xmm7,%xmm6
-	movdqa	96(%ebp),%xmm0
-	paddd	%xmm5,%xmm0
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-.byte	15,56,205,245
-	movdqa	128(%ebp),%xmm7
-.byte	15,56,203,202
-	movdqa	112(%ebp),%xmm0
-	paddd	%xmm6,%xmm0
-	nop
-.byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
-	cmpl	%edi,%eax
-	nop
-.byte	15,56,203,202
-	paddd	16(%esp),%xmm2
-	paddd	(%esp),%xmm1
-	jnz	L010loop_shaext
-	pshufd	$177,%xmm2,%xmm2
-	pshufd	$27,%xmm1,%xmm7
-	pshufd	$177,%xmm1,%xmm1
-	punpckhqdq	%xmm2,%xmm1
-.byte	102,15,58,15,215,8
-	movl	44(%esp),%esp
-	movdqu	%xmm1,(%esi)
-	movdqu	%xmm2,16(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	5,0x90
-L005SSSE3:
+L004SSSE3:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebx
@@ -3383,9 +3183,9 @@ L005SSSE3:
 	movl	%ecx,24(%esp)
 	movl	%esi,28(%esp)
 	movdqa	256(%ebp),%xmm7
-	jmp	L011grand_ssse3
+	jmp	L009grand_ssse3
 .align	4,0x90
-L011grand_ssse3:
+L009grand_ssse3:
 	movdqu	(%edi),%xmm0
 	movdqu	16(%edi),%xmm1
 	movdqu	32(%edi),%xmm2
@@ -3408,9 +3208,9 @@ L011grand_ssse3:
 	paddd	%xmm3,%xmm7
 	movdqa	%xmm6,64(%esp)
 	movdqa	%xmm7,80(%esp)
-	jmp	L012ssse3_00_47
+	jmp	L010ssse3_00_47
 .align	4,0x90
-L012ssse3_00_47:
+L010ssse3_00_47:
 	addl	$64,%ebp
 	movl	%edx,%ecx
 	movdqa	%xmm1,%xmm4
@@ -4053,7 +3853,7 @@ L012ssse3_00_47:
 	addl	%ecx,%eax
 	movdqa	%xmm6,80(%esp)
 	cmpl	$66051,64(%ebp)
-	jne	L012ssse3_00_47
+	jne	L010ssse3_00_47
 	movl	%edx,%ecx
 	rorl	$14,%edx
 	movl	20(%esp),%esi
@@ -4567,7 +4367,7 @@ L012ssse3_00_47:
 	movdqa	64(%ebp),%xmm7
 	subl	$192,%ebp
 	cmpl	104(%esp),%edi
-	jb	L011grand_ssse3
+	jb	L009grand_ssse3
 	movl	108(%esp),%esp
 	popl	%edi
 	popl	%esi
diff --git a/third_party/boringssl/win-x86/crypto/sha/sha1-586.asm b/third_party/boringssl/win-x86/crypto/sha/sha1-586.asm
index e24449d..43bf964 100644
--- a/third_party/boringssl/win-x86/crypto/sha/sha1-586.asm
+++ b/third_party/boringssl/win-x86/crypto/sha/sha1-586.asm
@@ -35,8 +35,6 @@ L$000pic_point:
 	mov	ecx,DWORD [8+esi]
 	test	eax,16777216
 	jz	NEAR L$001x86
-	test	ecx,536870912
-	jnz	NEAR L$shaext_shortcut
 	jmp	NEAR L$ssse3_shortcut
 align	16
 L$001x86:
@@ -1405,7 +1403,7 @@ L$002loop:
 	pop	ebp
 	ret
 align	16
-__sha1_block_data_order_shaext:
+__sha1_block_data_order_ssse3:
 	push	ebp
 	push	ebx
 	push	esi
@@ -1414,174 +1412,6 @@ __sha1_block_data_order_shaext:
 L$003pic_point:
 	pop	ebp
 	lea	ebp,[(L$K_XX_XX-L$003pic_point)+ebp]
-L$shaext_shortcut:
-	mov	edi,DWORD [20+esp]
-	mov	ebx,esp
-	mov	esi,DWORD [24+esp]
-	mov	ecx,DWORD [28+esp]
-	sub	esp,32
-	movdqu	xmm0,[edi]
-	movd	xmm1,DWORD [16+edi]
-	and	esp,-32
-	movdqa	xmm3,[80+ebp]
-	movdqu	xmm4,[esi]
-	pshufd	xmm0,xmm0,27
-	movdqu	xmm5,[16+esi]
-	pshufd	xmm1,xmm1,27
-	movdqu	xmm6,[32+esi]
-db	102,15,56,0,227
-	movdqu	xmm7,[48+esi]
-db	102,15,56,0,235
-db	102,15,56,0,243
-db	102,15,56,0,251
-	jmp	NEAR L$004loop_shaext
-align	16
-L$004loop_shaext:
-	dec	ecx
-	lea	eax,[64+esi]
-	movdqa	[esp],xmm1
-	paddd	xmm1,xmm4
-	cmovne	esi,eax
-	movdqa	[16+esp],xmm0
-db	15,56,201,229
-	movdqa	xmm2,xmm0
-db	15,58,204,193,0
-db	15,56,200,213
-	pxor	xmm4,xmm6
-db	15,56,201,238
-db	15,56,202,231
-	movdqa	xmm1,xmm0
-db	15,58,204,194,0
-db	15,56,200,206
-	pxor	xmm5,xmm7
-db	15,56,202,236
-db	15,56,201,247
-	movdqa	xmm2,xmm0
-db	15,58,204,193,0
-db	15,56,200,215
-	pxor	xmm6,xmm4
-db	15,56,201,252
-db	15,56,202,245
-	movdqa	xmm1,xmm0
-db	15,58,204,194,0
-db	15,56,200,204
-	pxor	xmm7,xmm5
-db	15,56,202,254
-db	15,56,201,229
-	movdqa	xmm2,xmm0
-db	15,58,204,193,0
-db	15,56,200,213
-	pxor	xmm4,xmm6
-db	15,56,201,238
-db	15,56,202,231
-	movdqa	xmm1,xmm0
-db	15,58,204,194,1
-db	15,56,200,206
-	pxor	xmm5,xmm7
-db	15,56,202,236
-db	15,56,201,247
-	movdqa	xmm2,xmm0
-db	15,58,204,193,1
-db	15,56,200,215
-	pxor	xmm6,xmm4
-db	15,56,201,252
-db	15,56,202,245
-	movdqa	xmm1,xmm0
-db	15,58,204,194,1
-db	15,56,200,204
-	pxor	xmm7,xmm5
-db	15,56,202,254
-db	15,56,201,229
-	movdqa	xmm2,xmm0
-db	15,58,204,193,1
-db	15,56,200,213
-	pxor	xmm4,xmm6
-db	15,56,201,238
-db	15,56,202,231
-	movdqa	xmm1,xmm0
-db	15,58,204,194,1
-db	15,56,200,206
-	pxor	xmm5,xmm7
-db	15,56,202,236
-db	15,56,201,247
-	movdqa	xmm2,xmm0
-db	15,58,204,193,2
-db	15,56,200,215
-	pxor	xmm6,xmm4
-db	15,56,201,252
-db	15,56,202,245
-	movdqa	xmm1,xmm0
-db	15,58,204,194,2
-db	15,56,200,204
-	pxor	xmm7,xmm5
-db	15,56,202,254
-db	15,56,201,229
-	movdqa	xmm2,xmm0
-db	15,58,204,193,2
-db	15,56,200,213
-	pxor	xmm4,xmm6
-db	15,56,201,238
-db	15,56,202,231
-	movdqa	xmm1,xmm0
-db	15,58,204,194,2
-db	15,56,200,206
-	pxor	xmm5,xmm7
-db	15,56,202,236
-db	15,56,201,247
-	movdqa	xmm2,xmm0
-db	15,58,204,193,2
-db	15,56,200,215
-	pxor	xmm6,xmm4
-db	15,56,201,252
-db	15,56,202,245
-	movdqa	xmm1,xmm0
-db	15,58,204,194,3
-db	15,56,200,204
-	pxor	xmm7,xmm5
-db	15,56,202,254
-	movdqu	xmm4,[esi]
-	movdqa	xmm2,xmm0
-db	15,58,204,193,3
-db	15,56,200,213
-	movdqu	xmm5,[16+esi]
-db	102,15,56,0,227
-	movdqa	xmm1,xmm0
-db	15,58,204,194,3
-db	15,56,200,206
-	movdqu	xmm6,[32+esi]
-db	102,15,56,0,235
-	movdqa	xmm2,xmm0
-db	15,58,204,193,3
-db	15,56,200,215
-	movdqu	xmm7,[48+esi]
-db	102,15,56,0,243
-	movdqa	xmm1,xmm0
-db	15,58,204,194,3
-	movdqa	xmm2,[esp]
-db	102,15,56,0,251
-db	15,56,200,202
-	paddd	xmm0,[16+esp]
-	jnz	NEAR L$004loop_shaext
-	pshufd	xmm0,xmm0,27
-	pshufd	xmm1,xmm1,27
-	movdqu	[edi],xmm0
-	movd	DWORD [16+edi],xmm1
-	mov	esp,ebx
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-__sha1_block_data_order_ssse3:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	call	L$005pic_point
-L$005pic_point:
-	pop	ebp
-	lea	ebp,[(L$K_XX_XX-L$005pic_point)+ebp]
 L$ssse3_shortcut:
 	movdqa	xmm7,[ebp]
 	movdqa	xmm0,[16+ebp]
@@ -1634,9 +1464,9 @@ db	102,15,56,0,222
 	xor	ebp,edx
 	pshufd	xmm4,xmm0,238
 	and	esi,ebp
-	jmp	NEAR L$006loop
+	jmp	NEAR L$004loop
 align	16
-L$006loop:
+L$004loop:
 	ror	ebx,2
 	xor	esi,edx
 	mov	ebp,eax
@@ -2539,7 +2369,7 @@ L$006loop:
 	add	ecx,edx
 	mov	ebp,DWORD [196+esp]
 	cmp	ebp,DWORD [200+esp]
-	je	NEAR L$007done
+	je	NEAR L$005done
 	movdqa	xmm7,[160+esp]
 	movdqa	xmm6,[176+esp]
 	movdqu	xmm0,[ebp]
@@ -2674,9 +2504,9 @@ db	102,15,56,0,222
 	pshufd	xmm4,xmm0,238
 	and	esi,ebx
 	mov	ebx,ebp
-	jmp	NEAR L$006loop
+	jmp	NEAR L$004loop
 align	16
-L$007done:
+L$005done:
 	add	ebx,DWORD [16+esp]
 	xor	esi,edi
 	mov	ebp,ecx
diff --git a/third_party/boringssl/win-x86/crypto/sha/sha256-586.asm b/third_party/boringssl/win-x86/crypto/sha/sha256-586.asm
index fe36bc5..d03558c 100644
--- a/third_party/boringssl/win-x86/crypto/sha/sha256-586.asm
+++ b/third_party/boringssl/win-x86/crypto/sha/sha256-586.asm
@@ -49,17 +49,15 @@ L$000pic_point:
 	jz	NEAR L$003no_xmm
 	and	ecx,1073741824
 	and	ebx,268435968
-	test	edx,536870912
-	jnz	NEAR L$004shaext
 	or	ecx,ebx
 	and	ecx,1342177280
 	cmp	ecx,1342177280
 	test	ebx,512
-	jnz	NEAR L$005SSSE3
+	jnz	NEAR L$004SSSE3
 L$003no_xmm:
 	sub	eax,edi
 	cmp	eax,256
-	jae	NEAR L$006unrolled
+	jae	NEAR L$005unrolled
 	jmp	NEAR L$002loop
 align	16
 L$002loop:
@@ -131,7 +129,7 @@ L$002loop:
 	mov	DWORD [28+esp],ecx
 	mov	DWORD [32+esp],edi
 align	16
-L$00700_15:
+L$00600_15:
 	mov	ecx,edx
 	mov	esi,DWORD [24+esp]
 	ror	ecx,14
@@ -169,11 +167,11 @@ L$00700_15:
 	add	ebp,4
 	add	eax,ebx
 	cmp	esi,3248222580
-	jne	NEAR L$00700_15
+	jne	NEAR L$00600_15
 	mov	ecx,DWORD [156+esp]
-	jmp	NEAR L$00816_63
+	jmp	NEAR L$00716_63
 align	16
-L$00816_63:
+L$00716_63:
 	mov	ebx,ecx
 	mov	esi,DWORD [104+esp]
 	ror	ecx,11
@@ -228,7 +226,7 @@ L$00816_63:
 	add	ebp,4
 	add	eax,ebx
 	cmp	esi,3329325298
-	jne	NEAR L$00816_63
+	jne	NEAR L$00716_63
 	mov	esi,DWORD [356+esp]
 	mov	ebx,DWORD [8+esp]
 	mov	ecx,DWORD [16+esp]
@@ -272,7 +270,7 @@ db	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
 db	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
 db	62,0
 align	16
-L$006unrolled:
+L$005unrolled:
 	lea	esp,[esp-96]
 	mov	eax,DWORD [esi]
 	mov	ebp,DWORD [4+esi]
@@ -289,9 +287,9 @@ L$006unrolled:
 	mov	DWORD [20+esp],ebx
 	mov	DWORD [24+esp],ecx
 	mov	DWORD [28+esp],esi
-	jmp	NEAR L$009grand_loop
+	jmp	NEAR L$008grand_loop
 align	16
-L$009grand_loop:
+L$008grand_loop:
 	mov	ebx,DWORD [edi]
 	mov	ecx,DWORD [4+edi]
 	bswap	ebx
@@ -3171,7 +3169,7 @@ L$009grand_loop:
 	mov	DWORD [24+esp],ebx
 	mov	DWORD [28+esp],ecx
 	cmp	edi,DWORD [104+esp]
-	jb	NEAR L$009grand_loop
+	jb	NEAR L$008grand_loop
 	mov	esp,DWORD [108+esp]
 	pop	edi
 	pop	esi
@@ -3179,205 +3177,7 @@ L$009grand_loop:
 	pop	ebp
 	ret
 align	32
-L$004shaext:
-	sub	esp,32
-	movdqu	xmm1,[esi]
-	lea	ebp,[128+ebp]
-	movdqu	xmm2,[16+esi]
-	movdqa	xmm7,[128+ebp]
-	pshufd	xmm0,xmm1,27
-	pshufd	xmm1,xmm1,177
-	pshufd	xmm2,xmm2,27
-db	102,15,58,15,202,8
-	punpcklqdq	xmm2,xmm0
-	jmp	NEAR L$010loop_shaext
-align	16
-L$010loop_shaext:
-	movdqu	xmm3,[edi]
-	movdqu	xmm4,[16+edi]
-	movdqu	xmm5,[32+edi]
-db	102,15,56,0,223
-	movdqu	xmm6,[48+edi]
-	movdqa	[16+esp],xmm2
-	movdqa	xmm0,[ebp-128]
-	paddd	xmm0,xmm3
-db	102,15,56,0,231
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	nop
-	movdqa	[esp],xmm1
-db	15,56,203,202
-	movdqa	xmm0,[ebp-112]
-	paddd	xmm0,xmm4
-db	102,15,56,0,239
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	lea	edi,[64+edi]
-db	15,56,204,220
-db	15,56,203,202
-	movdqa	xmm0,[ebp-96]
-	paddd	xmm0,xmm5
-db	102,15,56,0,247
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm6
-db	102,15,58,15,253,4
-	nop
-	paddd	xmm3,xmm7
-db	15,56,204,229
-db	15,56,203,202
-	movdqa	xmm0,[ebp-80]
-	paddd	xmm0,xmm6
-db	15,56,205,222
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm3
-db	102,15,58,15,254,4
-	nop
-	paddd	xmm4,xmm7
-db	15,56,204,238
-db	15,56,203,202
-	movdqa	xmm0,[ebp-64]
-	paddd	xmm0,xmm3
-db	15,56,205,227
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm4
-db	102,15,58,15,251,4
-	nop
-	paddd	xmm5,xmm7
-db	15,56,204,243
-db	15,56,203,202
-	movdqa	xmm0,[ebp-48]
-	paddd	xmm0,xmm4
-db	15,56,205,236
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm5
-db	102,15,58,15,252,4
-	nop
-	paddd	xmm6,xmm7
-db	15,56,204,220
-db	15,56,203,202
-	movdqa	xmm0,[ebp-32]
-	paddd	xmm0,xmm5
-db	15,56,205,245
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm6
-db	102,15,58,15,253,4
-	nop
-	paddd	xmm3,xmm7
-db	15,56,204,229
-db	15,56,203,202
-	movdqa	xmm0,[ebp-16]
-	paddd	xmm0,xmm6
-db	15,56,205,222
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm3
-db	102,15,58,15,254,4
-	nop
-	paddd	xmm4,xmm7
-db	15,56,204,238
-db	15,56,203,202
-	movdqa	xmm0,[ebp]
-	paddd	xmm0,xmm3
-db	15,56,205,227
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm4
-db	102,15,58,15,251,4
-	nop
-	paddd	xmm5,xmm7
-db	15,56,204,243
-db	15,56,203,202
-	movdqa	xmm0,[16+ebp]
-	paddd	xmm0,xmm4
-db	15,56,205,236
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm5
-db	102,15,58,15,252,4
-	nop
-	paddd	xmm6,xmm7
-db	15,56,204,220
-db	15,56,203,202
-	movdqa	xmm0,[32+ebp]
-	paddd	xmm0,xmm5
-db	15,56,205,245
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm6
-db	102,15,58,15,253,4
-	nop
-	paddd	xmm3,xmm7
-db	15,56,204,229
-db	15,56,203,202
-	movdqa	xmm0,[48+ebp]
-	paddd	xmm0,xmm6
-db	15,56,205,222
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm3
-db	102,15,58,15,254,4
-	nop
-	paddd	xmm4,xmm7
-db	15,56,204,238
-db	15,56,203,202
-	movdqa	xmm0,[64+ebp]
-	paddd	xmm0,xmm3
-db	15,56,205,227
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm4
-db	102,15,58,15,251,4
-	nop
-	paddd	xmm5,xmm7
-db	15,56,204,243
-db	15,56,203,202
-	movdqa	xmm0,[80+ebp]
-	paddd	xmm0,xmm4
-db	15,56,205,236
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	movdqa	xmm7,xmm5
-db	102,15,58,15,252,4
-db	15,56,203,202
-	paddd	xmm6,xmm7
-	movdqa	xmm0,[96+ebp]
-	paddd	xmm0,xmm5
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-db	15,56,205,245
-	movdqa	xmm7,[128+ebp]
-db	15,56,203,202
-	movdqa	xmm0,[112+ebp]
-	paddd	xmm0,xmm6
-	nop
-db	15,56,203,209
-	pshufd	xmm0,xmm0,14
-	cmp	eax,edi
-	nop
-db	15,56,203,202
-	paddd	xmm2,[16+esp]
-	paddd	xmm1,[esp]
-	jnz	NEAR L$010loop_shaext
-	pshufd	xmm2,xmm2,177
-	pshufd	xmm7,xmm1,27
-	pshufd	xmm1,xmm1,177
-	punpckhqdq	xmm1,xmm2
-db	102,15,58,15,215,8
-	mov	esp,DWORD [44+esp]
-	movdqu	[esi],xmm1
-	movdqu	[16+esi],xmm2
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	32
-L$005SSSE3:
+L$004SSSE3:
 	lea	esp,[esp-96]
 	mov	eax,DWORD [esi]
 	mov	ebx,DWORD [4+esi]
@@ -3396,9 +3196,9 @@ L$005SSSE3:
 	mov	DWORD [24+esp],ecx
 	mov	DWORD [28+esp],esi
 	movdqa	xmm7,[256+ebp]
-	jmp	NEAR L$011grand_ssse3
+	jmp	NEAR L$009grand_ssse3
 align	16
-L$011grand_ssse3:
+L$009grand_ssse3:
 	movdqu	xmm0,[edi]
 	movdqu	xmm1,[16+edi]
 	movdqu	xmm2,[32+edi]
@@ -3421,9 +3221,9 @@ db	102,15,56,0,223
 	paddd	xmm7,xmm3
 	movdqa	[64+esp],xmm6
 	movdqa	[80+esp],xmm7
-	jmp	NEAR L$012ssse3_00_47
+	jmp	NEAR L$010ssse3_00_47
 align	16
-L$012ssse3_00_47:
+L$010ssse3_00_47:
 	add	ebp,64
 	mov	ecx,edx
 	movdqa	xmm4,xmm1
@@ -4066,7 +3866,7 @@ db	102,15,58,15,249,4
 	add	eax,ecx
 	movdqa	[80+esp],xmm6
 	cmp	DWORD [64+ebp],66051
-	jne	NEAR L$012ssse3_00_47
+	jne	NEAR L$010ssse3_00_47
 	mov	ecx,edx
 	ror	edx,14
 	mov	esi,DWORD [20+esp]
@@ -4580,7 +4380,7 @@ db	102,15,58,15,249,4
 	movdqa	xmm7,[64+ebp]
 	sub	ebp,192
 	cmp	edi,DWORD [104+esp]
-	jb	NEAR L$011grand_ssse3
+	jb	NEAR L$009grand_ssse3
 	mov	esp,DWORD [108+esp]
 	pop	edi
 	pop	esi