Skip to content

Commit aaa09eb

Browse files
shigekishigeki
committed
update asm files in openssl-1.0.2l
1 parent a389060 commit aaa09eb

File tree

15 files changed

+111
-105
lines changed

15 files changed

+111
-105
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4146,11 +4146,12 @@ $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

41524153
pshufd xmm0,xmm1,01bh
4153-
pshufd xmm1,xmm1,0b1h
4154+
pshufd xmm1,xmm1,1h
41544155
pshufd xmm2,xmm2,01bh
41554156
movdqa xmm7,xmm3
41564157
DB 102,15,58,15,202,8
@@ -4475,9 +4476,9 @@ $L$aesenclast4::
44754476
lea rdi,QWORD PTR[64+rdi]
44764477
jnz $L$oop_shaext
44774478

4478-
pshufd xmm2,xmm2,0b1h
4479+
pshufd xmm2,xmm2,1h
44794480
pshufd xmm3,xmm1,01bh
4480-
pshufd xmm1,xmm1,0b1h
4481+
pshufd xmm1,xmm1,1h
44814482
punpckhqdq xmm1,xmm2
44824483
DB 102,15,58,15,211,8
44834484

‎deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ $L$SEH_begin_ecp_nistz256_point_add::
20512051
por xmm5,xmm4
20522052

20532053
movdqu xmm0,XMMWORD PTR[rsi]
2054-
pshufd xmm3,xmm5,0b1h
2054+
pshufd xmm3,xmm5,1h
20552055
movdqu xmm1,XMMWORD PTR[16+rsi]
20562056
movdqu xmm2,XMMWORD PTR[32+rsi]
20572057
por xmm5,xmm3
@@ -2081,7 +2081,7 @@ DB 102,72,15,110,199
20812081
call __ecp_nistz256_sqr_montq
20822082

20832083
pcmpeqd xmm5,xmm4
2084-
pshufd xmm4,xmm1,0b1h
2084+
pshufd xmm4,xmm1,1h
20852085
por xmm4,xmm1
20862086
pshufd xmm5,xmm5,0
20872087
pshufd xmm3,xmm4,01eh
@@ -2466,7 +2466,7 @@ $L$SEH_begin_ecp_nistz256_point_add_affine::
24662466
por xmm5,xmm4
24672467

24682468
movdqu xmm0,XMMWORD PTR[rbx]
2469-
pshufd xmm3,xmm5,0b1h
2469+
pshufd xmm3,xmm5,1h
24702470
movdqu xmm1,XMMWORD PTR[16+rbx]
24712471
movdqu xmm2,XMMWORD PTR[32+rbx]
24722472
por xmm5,xmm3
@@ -2488,7 +2488,7 @@ DB 102,72,15,110,199
24882488
call __ecp_nistz256_sqr_montq
24892489

24902490
pcmpeqd xmm5,xmm4
2491-
pshufd xmm4,xmm3,0b1h
2491+
pshufd xmm4,xmm3,1h
24922492
mov rax,QWORD PTR[rbx]
24932493

24942494
mov r9,r12
@@ -3117,7 +3117,7 @@ $L$point_addx::
31173117
por xmm5,xmm4
31183118

31193119
movdqu xmm0,XMMWORD PTR[rsi]
3120-
pshufd xmm3,xmm5,0b1h
3120+
pshufd xmm3,xmm5,1h
31213121
movdqu xmm1,XMMWORD PTR[16+rsi]
31223122
movdqu xmm2,XMMWORD PTR[32+rsi]
31233123
por xmm5,xmm3
@@ -3147,7 +3147,7 @@ DB 102,72,15,110,199
31473147
call __ecp_nistz256_sqr_montx
31483148

31493149
pcmpeqd xmm5,xmm4
3150-
pshufd xmm4,xmm1,0b1h
3150+
pshufd xmm4,xmm1,1h
31513151
por xmm4,xmm1
31523152
pshufd xmm5,xmm5,0
31533153
pshufd xmm3,xmm4,01eh
@@ -3528,7 +3528,7 @@ $L$point_add_affinex::
35283528
por xmm5,xmm4
35293529

35303530
movdqu xmm0,XMMWORD PTR[rbx]
3531-
pshufd xmm3,xmm5,0b1h
3531+
pshufd xmm3,xmm5,1h
35323532
movdqu xmm1,XMMWORD PTR[16+rbx]
35333533
movdqu xmm2,XMMWORD PTR[32+rbx]
35343534
por xmm5,xmm3
@@ -3550,7 +3550,7 @@ DB 102,72,15,110,199
35503550
call __ecp_nistz256_sqr_montx
35513551

35523552
pcmpeqd xmm5,xmm4
3553-
pshufd xmm4,xmm3,0b1h
3553+
pshufd xmm4,xmm3,1h
35543554
mov rdx,QWORD PTR[rbx]
35553555

35563556
mov r9,r12

0 commit comments

Comments
 (0)