Skip to content

Upgrade to openssl 102h for master #6550

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

Closed
shigeki wants to merge 8 commits into from
Closed

Upgrade to openssl 102h for master #6550

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
241aef0
deps: upgrade openssl sources to 1.0.2h
May 3, 2016
72346e1
deps: copy all openssl header files to include dir
May 3, 2016
1e5b490
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
cdf41ba
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
e1f68a4
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
89aad0a
deps: add -no_rand_screen to openssl s_client
May 27, 2015
db47579
deps: update openssl asm and asm_obsolete files
May 3, 2016
3f4e596
test: fix alpn tests for openssl1.0.2h
May 3, 2016
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
indutny authored and Shigeki Ohtsu committed May 3, 2016
commit 1e5b490348f443a16143abf214d6874dae8d85f5
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