-
Notifications
You must be signed in to change notification settings - Fork 29.8k
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.
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
Upgrade to openssl-1.0.1u for v0.12 #8718
Conversation
This just replaces all sources of openssl-1.0.1u.tar.gz into deps/openssl/openssl.
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.
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>
`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>
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>
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 9f0f7c38e6df975dd39735d0e9ef968076369c74) Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: nodejs/node-v0.x-archive#25368
CI is running on https://ci.nodejs.org/job/node-test-pull-request/4213/ . |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
CI failed only in |
LGTM |
Thanks for all. Landed in baaeeab3c740c6b659cb2e1a135fe69d36cdcb30, a1ad193e1fde1af908908d01ef5ef99888f52dfc, c531bb2bbf46dce5de03b419f29540079934eac1, 4177f3091139814b4f44dd7d3f7ef411df7d0220, 9d9a1fa72962e9786c2645a0873230a6d638f69a and c5b01a12d0c8caf3bec259822708b684b94323fe for v0.12-staging. @thealphanerd I would like you to take care v0.10. |
@shigeki on it |
This just replaces all sources of openssl-1.0.1u.tar.gz into deps/openssl/openssl. PR-URL: nodejs#8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
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#8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
This just replaces all sources of openssl-1.0.1u.tar.gz into deps/openssl/openssl. PR-URL: #8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
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: #8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
Was the v0.12-staging branch used for the final release build of V0.12.16? I cannot see a v0.12 branch anymore... |
I deleted something in my bnoordhuis/io.js fork but somehow it ended up deleting the branch in the main repo... I'll restore it. |
This just replaces all sources of openssl-1.0.1u.tar.gz into deps/openssl/openssl. PR-URL: nodejs/node#8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
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#8718 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Myles Borins <mborins@us.ibm.com>
Checklist
make -j4 test
(UNIX), orvcbuild test nosign
(Windows) passesAffected core subsystem(s)
Description of change
This upgrade v0.12 to openssl-1.0.1u. No asm and config are changed in this upgrade.
CC @indutny , @jbergstroem or @thealphanerd