Skip to content

v4.8.7 proposal #17534

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

Merged
MylesBorins merged 8 commits into from
Dec 8, 2017
Merged

v4.8.7 proposal #17534

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3afedf
deps: upgrade openssl sources to 1.0.2n
shigeki Dec 7, 2017
dd6a2df
deps: copy all openssl header files to include dir
shigeki Dec 7, 2017
b0ed4c5
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
3e6b0b0
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
f7eb162
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
eacd090
deps: add -no_rand_screen to openssl s_client
May 27, 2015
4f8fae3
deps: update openssl asm and asm_obsolete files
shigeki Dec 7, 2017
e6ea634
2017-12-08, Version 4.8.7 'Argon' (LTS)
MylesBorins Dec 7, 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
Prev Previous commit
Next Next commit
deps: fix openssl assembly error on ia32 win32 
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

Fixes: #589
PR-URL: #1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
  • Loading branch information
@indutny @MylesBorins
indutny authored and MylesBorins committed Dec 7, 2017
commit b0ed4c52af3edc9623c0a2ac6911835c58d30ecb
2 changes: 1 addition & 1 deletion deps/openssl/openssl/crypto/perlasm/x86masm.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ sub ::file
IF \@Version LT 800
ECHO MASM version 8.00 or later is strongly recommended.
ENDIF
.486
.686
.MODEL FLAT
OPTION DOTNAME
IF \@Version LT 800
Expand Down