This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
deps: update to openssl-1.0.1m #9451
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Extract the tarball into deps/openssl/openssl
change all openssl/include/openssl/*.h to include resolved symbolic links and openssl/crypto/opensslconf.h to refer config/opensslconf.h
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length.
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 .
It is no longer used.
deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally committed before.
|
@jasnell @indutny Out of curiosity, what problem does jasnell/node@7817fbd solve? I don't see any assembly file changed in this PR, and unless I'm missing something the perl script is not run when OpenSSL is built in node's tree. Also, building node with |
|
@jasnell Ran |
|
@misterdjules auto-generated assembly contains this on a newer OpenSSL. Basically, it'll fail to build with |
|
@indutny By "newer OpenSSL", do you mean other versions than 1.0.1m? Also, like I said in my previous comment node builds without any problem for me on Windows for ia32 with |
|
@indutny Ok, just realized that it's another old floating patch, and that it'll have an impact if any asm file needs to be (re)generated on Windows, which has not been the case for this upgrade. Sorry for the confusion. |
|
LGTM. |
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
Extract the tarball into deps/openssl/openssl PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
change all openssl/include/openssl/*.h to include resolved symbolic links and openssl/crypto/opensslconf.h to refer config/opensslconf.h PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
It is no longer used. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally committed before. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
misterdjules
pushed a commit
to misterdjules/node
that referenced
this pull request
Mar 23, 2015
reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
|
@joyent/node-coreteam Landing and doing a release asap. |
|
No regression on UNIX nor on Windows. |
shigeki
pushed a commit
to nodejs/node
that referenced
this pull request
May 5, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
shigeki
pushed a commit
to nodejs/node
that referenced
this pull request
May 5, 2016
reapply b910613 PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
enricogior
pushed a commit
to thaliproject/jxcore
that referenced
this pull request
Aug 20, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
enricogior
pushed a commit
to thaliproject/jxcore
that referenced
this pull request
Aug 20, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
enricogior
pushed a commit
to thaliproject/jxcore
that referenced
this pull request
Aug 20, 2016
reapply b910613792dac946b295855963869933a9089044 PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
shigeki
pushed a commit
to shigeki/node
that referenced
this pull request
Sep 22, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
shigeki
pushed a commit
to shigeki/node
that referenced
this pull request
Sep 22, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
shigeki
pushed a commit
to shigeki/node
that referenced
this pull request
Sep 22, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
MylesBorins
pushed a commit
to MylesBorins/node
that referenced
this pull request
Sep 22, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
MylesBorins
pushed a commit
to MylesBorins/node
that referenced
this pull request
Sep 22, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
MylesBorins
pushed a commit
to MylesBorins/node
that referenced
this pull request
Sep 22, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
rvagg
pushed a commit
to nodejs/node
that referenced
this pull request
Sep 27, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
rvagg
pushed a commit
to nodejs/node
that referenced
this pull request
Sep 27, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
rvagg
pushed a commit
to nodejs/node
that referenced
this pull request
Sep 27, 2016
reapply b910613 PR: #9451 PR-URL: nodejs/node-v0.x-archive#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: #25523 PR-URL: nodejs/node-v0.x-archive#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: #25654 PR-URL: nodejs/node-v0.x-archive#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
This replaces all sources of openssl-1.0.1r.tar.gz into deps/openssl/openssl PR-URL: nodejs/node#4967 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> deps: copy all openssl header files to include dir All symlink files in `deps/openssl/openssl/include/openssl/` are removed and replaced with real header files to avoid issues on Windows. Two files of opensslconf.h in crypto and include dir are replaced to refer config/opensslconf.h. PR-URL: nodejs/node#4967 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> deps: separate sha256/sha512-x86_64.pl for openssl sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> deps: fix openssl assembly error on ia32 win32 `x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> openssl: fix keypress requirement in apps on win32 reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> deps: add -no_rand_screen to openssl s_client In openssl s_client on Windows, RAND_screen() is invoked to initialize random state but it takes several seconds in each connection. This added -no_rand_screen to openssl s_client on Windows to skip RAND_screen() and gets a better performance in the unit test of test-tls-server-verify. Do not enable this except to use in the unit test. (cherry picked from commit 9f0f7c3) Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: nodejs#25368
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
sha256-x86_64.pl does not exist in the origin openssl distribution. It was copied from sha512-x86_64.pl and both sha256/sha512 scripts were modified so as to generates only one asm file specified as its key hash length. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
jBarz
pushed a commit
to ibmruntimes/node
that referenced
this pull request
Nov 4, 2016
reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR: nodejs#25523 PR-URL: nodejs#25523 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR: nodejs#25654 PR-URL: nodejs#25654 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The commits are split out the same way as in @shigeki's io.js commit (nodejs/node#1206). The end result is identical to the previous PR.