Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to OpenSSL-1.0.2m #16691

Closed
wants to merge 7 commits into from
Closed

Upgrade to OpenSSL-1.0.2m #16691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ff1b8de
deps: upgrade openssl sources to 1.0.2m
shigeki Nov 2, 2017
7f94976
deps: copy all openssl header files to include dir
shigeki Nov 2, 2017
b7c3b98
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
a99627e
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
a476006
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
34e7adf
deps: add -no_rand_screen to openssl s_client
May 27, 2015
7506453
deps: update openssl asm and asm_obsolete files
shigeki Nov 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3075,11 +3075,19 @@ __bn_sqrx8x_internal:

.align 32
.Lsqrx8x_break:
subq 16+8(%rsp),%r8
xorq %rbp,%rbp
subq 16+8(%rsp),%rbx
adcxq %rbp,%r8
movq 24+8(%rsp),%rcx
adcxq %rbp,%r9
movq 0(%rsi),%rdx
xorl %ebp,%ebp
adcq $0,%r10
movq %r8,0(%rdi)
adcq $0,%r11
adcq $0,%r12
adcq $0,%r13
adcq $0,%r14
adcq $0,%r15
cmpq %rcx,%rdi
je .Lsqrx8x_outer_loop

Expand Down
20 changes: 8 additions & 12 deletions deps/openssl/asm/x64-elf-gas/ec/ecp_nistz256-x86_64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,19 +1036,18 @@ __ecp_nistz256_sqr_montx:
adoxq %rbp,%r13
.byte 0x67,0x67
mulxq %rdx,%rcx,%rax
movq %r8,%rdx
movq .Lpoly+24(%rip),%rdx
adoxq %rcx,%r14
shlxq %rsi,%r8,%rcx
adoxq %rax,%r15
shrxq %rsi,%r8,%rax
movq .Lpoly+24(%rip),%rbp
movq %rdx,%rbp


addq %rcx,%r9
adcq %rax,%r10

mulxq %rbp,%rcx,%r8
movq %r9,%rdx
mulxq %r8,%rcx,%r8
adcq %rcx,%r11
shlxq %rsi,%r9,%rcx
adcq $0,%r8
Expand All @@ -1058,8 +1057,7 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r10
adcq %rax,%r11

mulxq %rbp,%rcx,%r9
movq %r10,%rdx
mulxq %r9,%rcx,%r9
adcq %rcx,%r8
shlxq %rsi,%r10,%rcx
adcq $0,%r9
Expand All @@ -1069,8 +1067,7 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r11
adcq %rax,%r8

mulxq %rbp,%rcx,%r10
movq %r11,%rdx
mulxq %r10,%rcx,%r10
adcq %rcx,%r9
shlxq %rsi,%r11,%rcx
adcq $0,%r10
Expand All @@ -1080,12 +1077,12 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r8
adcq %rax,%r9

mulxq %rbp,%rcx,%r11
mulxq %r11,%rcx,%r11
adcq %rcx,%r10
adcq $0,%r11

xorq %rdx,%rdx
adcq %r8,%r12
addq %r8,%r12
movq .Lpoly+8(%rip),%rsi
adcq %r9,%r13
movq %r12,%r8
Expand All @@ -1094,8 +1091,7 @@ __ecp_nistz256_sqr_montx:
movq %r13,%r9
adcq $0,%rdx

xorl %eax,%eax
sbbq $-1,%r12
subq $-1,%r12
movq %r14,%r10
sbbq %rsi,%r13
sbbq $0,%r14
Expand Down
17 changes: 16 additions & 1 deletion deps/openssl/asm/x64-elf-gas/x86_64cpuid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,19 @@ OPENSSL_ia32_cpuid:
orl $0x40000000,%edx
andb $15,%ah
cmpb $15,%ah
jne .Lnotintel
jne .LnotP4
orl $0x00100000,%edx
.LnotP4:
cmpb $6,%ah
jne .Lnotintel
andl $0x0fff0ff0,%eax
cmpl $0x00050670,%eax
je .Lknights
cmpl $0x00080650,%eax
jne .Lnotintel
.Lknights:
andl $0xfbffffff,%ecx

.Lnotintel:
btl $28,%edx
jnc .Lgeneric
Expand All @@ -142,6 +153,10 @@ OPENSSL_ia32_cpuid:
movl $7,%eax
xorl %ecx,%ecx
cpuid
btl $26,%r9d
jc .Lnotknights
andl $0xfff7ffff,%ebx
.Lnotknights:
movl %ebx,8(%rdi)
.Lno_extended_info:

Expand Down
12 changes: 10 additions & 2 deletions deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3075,11 +3075,19 @@ L$sqrx8x_loop:

.p2align 5
L$sqrx8x_break:
subq 16+8(%rsp),%r8
xorq %rbp,%rbp
subq 16+8(%rsp),%rbx
adcxq %rbp,%r8
movq 24+8(%rsp),%rcx
adcxq %rbp,%r9
movq 0(%rsi),%rdx
xorl %ebp,%ebp
adcq $0,%r10
movq %r8,0(%rdi)
adcq $0,%r11
adcq $0,%r12
adcq $0,%r13
adcq $0,%r14
adcq $0,%r15
cmpq %rcx,%rdi
je L$sqrx8x_outer_loop

Expand Down
20 changes: 8 additions & 12 deletions deps/openssl/asm/x64-macosx-gas/ec/ecp_nistz256-x86_64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,19 +1036,18 @@ __ecp_nistz256_sqr_montx:
adoxq %rbp,%r13
.byte 0x67,0x67
mulxq %rdx,%rcx,%rax
movq %r8,%rdx
movq L$poly+24(%rip),%rdx
adoxq %rcx,%r14
shlxq %rsi,%r8,%rcx
adoxq %rax,%r15
shrxq %rsi,%r8,%rax
movq L$poly+24(%rip),%rbp
movq %rdx,%rbp


addq %rcx,%r9
adcq %rax,%r10

mulxq %rbp,%rcx,%r8
movq %r9,%rdx
mulxq %r8,%rcx,%r8
adcq %rcx,%r11
shlxq %rsi,%r9,%rcx
adcq $0,%r8
Expand All @@ -1058,8 +1057,7 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r10
adcq %rax,%r11

mulxq %rbp,%rcx,%r9
movq %r10,%rdx
mulxq %r9,%rcx,%r9
adcq %rcx,%r8
shlxq %rsi,%r10,%rcx
adcq $0,%r9
Expand All @@ -1069,8 +1067,7 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r11
adcq %rax,%r8

mulxq %rbp,%rcx,%r10
movq %r11,%rdx
mulxq %r10,%rcx,%r10
adcq %rcx,%r9
shlxq %rsi,%r11,%rcx
adcq $0,%r10
Expand All @@ -1080,12 +1077,12 @@ __ecp_nistz256_sqr_montx:
addq %rcx,%r8
adcq %rax,%r9

mulxq %rbp,%rcx,%r11
mulxq %r11,%rcx,%r11
adcq %rcx,%r10
adcq $0,%r11

xorq %rdx,%rdx
adcq %r8,%r12
addq %r8,%r12
movq L$poly+8(%rip),%rsi
adcq %r9,%r13
movq %r12,%r8
Expand All @@ -1094,8 +1091,7 @@ __ecp_nistz256_sqr_montx:
movq %r13,%r9
adcq $0,%rdx

xorl %eax,%eax
sbbq $-1,%r12
subq $-1,%r12
movq %r14,%r10
sbbq %rsi,%r13
sbbq $0,%r14
Expand Down
17 changes: 16 additions & 1 deletion deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,19 @@ L$nocacheinfo:
orl $0x40000000,%edx
andb $15,%ah
cmpb $15,%ah
jne L$notintel
jne L$notP4
orl $0x00100000,%edx
L$notP4:
cmpb $6,%ah
jne L$notintel
andl $0x0fff0ff0,%eax
cmpl $0x00050670,%eax
je L$knights
cmpl $0x00080650,%eax
jne L$notintel
L$knights:
andl $0xfbffffff,%ecx

L$notintel:
btl $28,%edx
jnc L$generic
Expand All @@ -143,6 +154,10 @@ L$generic:
movl $7,%eax
xorl %ecx,%ecx
cpuid
btl $26,%r9d
jc L$notknights
andl $0xfff7ffff,%ebx
L$notknights:
movl %ebx,8(%rdi)
L$no_extended_info:

Expand Down
12 changes: 10 additions & 2 deletions deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,11 +3166,19 @@ DB 067h

ALIGN 32
$L$sqrx8x_break::
sub r8,QWORD PTR[((16+8))+rsp]
xor rbp,rbp
sub rbx,QWORD PTR[((16+8))+rsp]
adcx r8,rbp
mov rcx,QWORD PTR[((24+8))+rsp]
adcx r9,rbp
mov rdx,QWORD PTR[rsi]
xor ebp,ebp
adc r10,0
mov QWORD PTR[rdi],r8
adc r11,0
adc r12,0
adc r13,0
adc r14,0
adc r15,0
cmp rdi,rcx
je $L$sqrx8x_outer_loop

Expand Down
20 changes: 8 additions & 12 deletions deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,19 +1137,18 @@ DB 067h
adox r13,rbp
DB 067h,067h
mulx rax,rcx,rdx
mov rdx,r8
mov rdx,QWORD PTR[(($L$poly+24))]
adox r14,rcx
shlx rcx,r8,rsi
adox r15,rax
shrx rax,r8,rsi
mov rbp,QWORD PTR[(($L$poly+24))]
mov rbp,rdx


add r9,rcx
adc r10,rax

mulx r8,rcx,rbp
mov rdx,r9
mulx r8,rcx,r8
adc r11,rcx
shlx rcx,r9,rsi
adc r8,0
Expand All @@ -1159,8 +1158,7 @@ DB 067h,067h
add r10,rcx
adc r11,rax

mulx r9,rcx,rbp
mov rdx,r10
mulx r9,rcx,r9
adc r8,rcx
shlx rcx,r10,rsi
adc r9,0
Expand All @@ -1170,8 +1168,7 @@ DB 067h,067h
add r11,rcx
adc r8,rax

mulx r10,rcx,rbp
mov rdx,r11
mulx r10,rcx,r10
adc r9,rcx
shlx rcx,r11,rsi
adc r10,0
Expand All @@ -1181,12 +1178,12 @@ DB 067h,067h
add r8,rcx
adc r9,rax

mulx r11,rcx,rbp
mulx r11,rcx,r11
adc r10,rcx
adc r11,0

xor rdx,rdx
adc r12,r8
add r12,r8
mov rsi,QWORD PTR[(($L$poly+8))]
adc r13,r9
mov r8,r12
Expand All @@ -1195,8 +1192,7 @@ DB 067h,067h
mov r9,r13
adc rdx,0

xor eax,eax
sbb r12,-1
sub r12,-1
mov r10,r14
sbb r13,rsi
sbb r14,0
Expand Down
17 changes: 16 additions & 1 deletion deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,19 @@ $L$nocacheinfo::
or edx,040000000h
and ah,15
cmp ah,15
jne $L$notintel
jne $L$notP4
or edx,000100000h
$L$notP4::
cmp ah,6
jne $L$notintel
and eax,00fff0ff0h
cmp eax,000050670h
je $L$knights
cmp eax,000080650h
jne $L$notintel
$L$knights::
and ecx,0fbffffffh

$L$notintel::
bt edx,28
jnc $L$generic
Expand All @@ -153,6 +164,10 @@ $L$generic::
mov eax,7
xor ecx,ecx
cpuid
bt r9d,26
jc $L$notknights
and ebx,0fff7ffffh
$L$notknights::
mov DWORD PTR[8+rdi],ebx
$L$no_extended_info::

Expand Down
17 changes: 16 additions & 1 deletion deps/openssl/asm_obsolete/x64-elf-gas/x86_64cpuid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,19 @@ OPENSSL_ia32_cpuid:
orl $0x40000000,%edx
andb $15,%ah
cmpb $15,%ah
jne .Lnotintel
jne .LnotP4
orl $0x00100000,%edx
.LnotP4:
cmpb $6,%ah
jne .Lnotintel
andl $0x0fff0ff0,%eax
cmpl $0x00050670,%eax
je .Lknights
cmpl $0x00080650,%eax
jne .Lnotintel
.Lknights:
andl $0xfbffffff,%ecx

.Lnotintel:
btl $28,%edx
jnc .Lgeneric
Expand All @@ -142,6 +153,10 @@ OPENSSL_ia32_cpuid:
movl $7,%eax
xorl %ecx,%ecx
cpuid
btl $26,%r9d
jc .Lnotknights
andl $0xfff7ffff,%ebx
.Lnotknights:
movl %ebx,8(%rdi)
.Lno_extended_info:

Expand Down
Loading