Skip to content

Commit 06eb181

Browse files
danbevMylesBorins
authored andcommitted
deps: update openssl asm and asm_obsolete files
Regenerate asm files with Makefile and CC=gcc and ASM=nasm where gcc version was 5.4.0 and nasm version was 2.11.08. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs. Fixes: #13161 Backport-PR-URL: #13696 PR-URL: #13233 Reviewed-By: Shigeki Ohtsu <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent c0fe1fc commit 06eb181

File tree

23 files changed

+191
-182
lines changed

23 files changed

+191
-182
lines changed

deps/openssl/asm/arm-void-gas/aes/bsaes-armv7.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ bsaes_cbc_encrypt:
12981298
vmov q4,q15 @ just in case ensure that IV
12991299
vmov q5,q0 @ and input are preserved
13001300
bl AES_decrypt
1301-
vld1.8 {q0}, [r9,:64] @ load result
1301+
vld1.8 {q0}, [r9] @ load result
13021302
veor q0, q0, q4 @ ^= IV
13031303
vmov q15, q5 @ q5 holds input
13041304
vst1.8 {q0}, [r10] @ write output

deps/openssl/asm/x64-elf-gas/aes/aesni-sha1-x86_64.s

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
26922692
movl 240(%rcx),%r11d
26932693
subq %rdi,%rsi
26942694
movups (%rcx),%xmm15
2695+
movups (%r8),%xmm2
26952696
movups 16(%rcx),%xmm0
26962697
leaq 112(%rcx),%rcx
26972698

deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
40124012
movl 240(%rcx),%r11d
40134013
subq %rdi,%rsi
40144014
movups (%rcx),%xmm15
4015+
movups (%r8),%xmm6
40154016
movups 16(%rcx),%xmm4
40164017
leaq 112(%rcx),%rcx
40174018

deps/openssl/asm/x64-elf-gas/x86_64cpuid.s

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ OPENSSL_ia32_cpuid:
107107
shrl $14,%r10d
108108
andl $0xfff,%r10d
109109

110-
cmpl $7,%r11d
111-
jb .Lnocacheinfo
112-
113-
movl $7,%eax
114-
xorl %ecx,%ecx
115-
cpuid
116-
movl %ebx,8(%rdi)
117-
118110
.Lnocacheinfo:
119111
movl $1,%eax
120112
cpuid
@@ -144,6 +136,15 @@ OPENSSL_ia32_cpuid:
144136
orl %ecx,%r9d
145137

146138
movl %edx,%r10d
139+
140+
cmpl $7,%r11d
141+
jb .Lno_extended_info
142+
movl $7,%eax
143+
xorl %ecx,%ecx
144+
cpuid
145+
movl %ebx,8(%rdi)
146+
.Lno_extended_info:
147+
147148
btl $27,%r9d
148149
jnc .Lclear_avx
149150
xorl %ecx,%ecx

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha1-x86_64.s

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
26922692
movl 240(%rcx),%r11d
26932693
subq %rdi,%rsi
26942694
movups (%rcx),%xmm15
2695+
movups (%r8),%xmm2
26952696
movups 16(%rcx),%xmm0
26962697
leaq 112(%rcx),%rcx
26972698

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
40124012
movl 240(%rcx),%r11d
40134013
subq %rdi,%rsi
40144014
movups (%rcx),%xmm15
4015+
movups (%r8),%xmm6
40154016
movups 16(%rcx),%xmm4
40164017
leaq 112(%rcx),%rcx
40174018

deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ L$intel:
108108
shrl $14,%r10d
109109
andl $0xfff,%r10d
110110

111-
cmpl $7,%r11d
112-
jb L$nocacheinfo
113-
114-
movl $7,%eax
115-
xorl %ecx,%ecx
116-
cpuid
117-
movl %ebx,8(%rdi)
118-
119111
L$nocacheinfo:
120112
movl $1,%eax
121113
cpuid
@@ -145,6 +137,15 @@ L$generic:
145137
orl %ecx,%r9d
146138

147139
movl %edx,%r10d
140+
141+
cmpl $7,%r11d
142+
jb L$no_extended_info
143+
movl $7,%eax
144+
xorl %ecx,%ecx
145+
cpuid
146+
movl %ebx,8(%rdi)
147+
L$no_extended_info:
148+
148149
btl $27,%r9d
149150
jnc L$clear_avx
150151
xorl %ecx,%ecx

deps/openssl/asm/x64-win32-masm/aes/aesni-sha1-x86_64.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2793,6 +2793,7 @@ $L$prologue_shaext::
27932793
mov r11d,DWORD PTR[240+rcx]
27942794
sub rsi,rdi
27952795
movups xmm15,XMMWORD PTR[rcx]
2796+
movups xmm2,XMMWORD PTR[r8]
27962797
movups xmm0,XMMWORD PTR[16+rcx]
27972798
lea rcx,QWORD PTR[112+rcx]
27982799

deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4146,6 +4146,7 @@ $L$prologue_shaext::
41464146
mov r11d,DWORD PTR[240+rcx]
41474147
sub rsi,rdi
41484148
movups xmm15,XMMWORD PTR[rcx]
4149+
movups xmm6,XMMWORD PTR[r8]
41494150
movups xmm4,XMMWORD PTR[16+rcx]
41504151
lea rcx,QWORD PTR[112+rcx]
41514152

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@ $L$intel::
118118
shr r10d,14
119119
and r10d,0fffh
120120

121-
cmp r11d,7
122-
jb $L$nocacheinfo
123-
124-
mov eax,7
125-
xor ecx,ecx
126-
cpuid
127-
mov DWORD PTR[8+rdi],ebx
128-
129121
$L$nocacheinfo::
130122
mov eax,1
131123
cpuid
@@ -155,6 +147,15 @@ $L$generic::
155147
or r9d,ecx
156148

157149
mov r10d,edx
150+
151+
cmp r11d,7
152+
jb $L$no_extended_info
153+
mov eax,7
154+
xor ecx,ecx
155+
cpuid
156+
mov DWORD PTR[8+rdi],ebx
157+
$L$no_extended_info::
158+
158159
bt r9d,27
159160
jnc $L$clear_avx
160161
xor ecx,ecx

0 commit comments

Comments
 (0)