Skip to content

Openssl 1.0.2i v6.x #8720

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
Sep 22, 2016
Merged

Openssl 1.0.2i v6.x #8720

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8937fd0
deps: upgrade openssl sources to 1.0.2i
shigeki Sep 22, 2016
3e4ea60
deps: copy all openssl header files to include dir
shigeki Sep 22, 2016
cfa0061
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
4382de3
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
a25fc3f
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
67751f3
deps: add -no_rand_screen to openssl s_client
May 27, 2015
2573efc
deps: update openssl asm and asm_obsolete files
shigeki Sep 22, 2016
a14d832
test: remove openssl options of -no_<prot>
shigeki Sep 22, 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 asm build error of openssl in x86_win32 
See
https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html

iojs needs to stop using masm and move to nasm or yasm on Win32.

Fixes: #589
PR-URL: #1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
Shigeki Ohtsu authored and Myles Borins committed Sep 22, 2016
commit 4382de338bfe9f5732c29e5697d31323a908c938
12 changes: 6 additions & 6 deletions deps/openssl/openssl/crypto/perlasm/x86masm.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ sub ::generic

if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no []
{ $opcode="mov"; }
elsif ($opcode !~ /movq/)
elsif ($opcode !~ /mov[dq]$/)
{ # fix xmm references
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i);
$arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
}

&::emit($opcode,@arg);
Expand Down Expand Up @@ -160,13 +160,13 @@ sub ::public_label
{ push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); }

sub ::data_byte
{ push(@out,("DB\t").join(',',@_)."\n"); }
{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); }

sub ::data_short
{ push(@out,("DW\t").join(',',@_)."\n"); }
{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); }

sub ::data_word
{ push(@out,("DD\t").join(',',@_)."\n"); }
{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); }

sub ::align
{ push(@out,"ALIGN\t$_[0]\n"); }
Expand Down