iframe-proxy

shigeki · 2017-01-26T16:12:30Z

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Affected core subsystem(s)

deps, openssl

This is a upgrading to the latest openssl-1.0.2k. I've just made upgrading source and header files and cherry-picked floating patches.

asm and asm_obsolete files needs to be updated due to fixes of CVE-2017-3732.

CC: @nodejs/crypto

This replaces all sources of openssl-1.0.2k.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.

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>

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: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Reapply b910613 . Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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. Fixes: nodejs#1461 PR-URL: nodejs#1836 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs

shigeki · 2017-01-26T16:13:53Z

bnoordhuis

Rubber-stamp LGTM.

indutny

LGTM, verified the source files. Thank you!

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

shigeki · 2017-01-26T17:10:37Z

CI is all green. Landed in 31e3b81, c0eefcb, 0af423c, 809fa3b, 0ea2711, 2a74481 and a67a04d.

@sam-github Please take care of above commits to v4 and v6. Notify me if you have any troubles.

@indutny Very sorry, I've just landed now missing your name in reviewers.

indutny · 2017-01-26T17:15:05Z

That's a pity. Please give me several hours next time,ください.

shigeki · 2017-01-26T17:20:42Z

@indutny Sorry, I will do next. I just wanted to go to bed early. By the way, Good Japanese.

indutny · 2017-01-26T17:34:13Z

No worries at all.

targos · 2017-01-28T12:50:59Z

While updating v7.x-staging, I saw that branch-diff only reports the commits that are new:

[31e3b81290] - deps: upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021
[c0eefcb461] - deps: copy all openssl header files to include dir (Shigeki Ohtsu) #11021
[a67a04d765] - deps: update openssl asm and asm_obsolete files (Shigeki Ohtsu) #11021

I took care of cherry-picking the 7 commits together but it could be easy to miss if one is not overcautious.

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: nodejs#11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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#11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

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: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 PR-URL: #11083

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 PR-URL: #11081

Notable changes: * crypto: * ability to select cert store at runtime (Adam Majer) #8334 * Use system CAs instead of using bundled ones (Adam Majer) #8334 * deps: * upgrade npm to 4.1.2 (Kat Marchán) #11020 * upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 * doc: add basic documentation for WHATWG URL API (James M Snell) #10620 * process: add NODE_NO_WARNINGS environment variable (cjihrig) #10842 * url: allow use of URL with http.request and https.request (James M Snell) #10638 PR-URL: #11062

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 PR-URL: #11081

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 PR-URL: #11083

Notable changes: * crypto: * ability to select cert store at runtime (Adam Majer) #8334 * Use system CAs instead of using bundled ones (Adam Majer) #8334 * deps: * upgrade npm to 4.1.2 (Kat Marchán) #11020 * upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021 * doc: add basic documentation for WHATWG URL API (James M Snell) #10620 * process: add NODE_NO_WARNINGS environment variable (cjihrig) #10842 * url: allow use of URL with http.request and https.request (James M Snell) #10638 PR-URL: #11062

Fishrock123 · 2017-02-02T00:09:20Z

@targos arguably a bug but yeah those probably look like dupes to it, in a sense.

There is a limited number of things it can reliable check, but those probably matches same author, same commit message, same PR-URL.

shigeki · 2017-02-02T01:26:08Z

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) nodejs/node#11021 PR-URL: nodejs/node#11083 Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) nodejs/node#11021 PR-URL: nodejs/node#11081 Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) nodejs/node#11021 PR-URL: nodejs/node#11083 Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

This is a security release of the 'Boron' release line to upgrade OpenSSL to version 1.0.2k Although the OpenSSL team have determined a maximum severity rating of "moderate", the Node.js crypto team (Ben Noordhuis, Shigeki Ohtsu and Fedor Indutny) have determined the impact to Node users is "low". Details on this determination can be found on the Nodejs.org website https://nodejs.org/en/blog/vulnerability/openssl-january-2017/ Notable Changes: * deps: - upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) nodejs/node#11021 PR-URL: nodejs/node#11081 Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

shigeki and others added 7 commits January 27, 2017 00:38

deps: upgrade openssl sources to 1.0.2k

edc8804

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl

deps: copy all openssl header files to include dir

b1c10cf

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.

openssl: fix keypress requirement in apps on win32

a7497f9

Reapply b910613 . Fixes: nodejs#589 PR-URL: nodejs#1389 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

deps: update openssl asm and asm_obsolete files

61800c5

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs

shigeki added the openssl Issues and PRs related to the OpenSSL dependency. label Jan 26, 2017

bnoordhuis approved these changes Jan 26, 2017

View reviewed changes

nodejs-github-bot added openssl Issues and PRs related to the OpenSSL dependency. lts-watch-v6.x labels Jan 26, 2017

indutny approved these changes Jan 26, 2017

View reviewed changes

shigeki added a commit that referenced this pull request Jan 26, 2017

deps: upgrade openssl sources to 1.0.2k

31e3b81

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

shigeki closed this Jan 26, 2017

shigeki mentioned this pull request Jan 26, 2017

RSA, DH, ECDH computation failures due to CVE-2016-7055 on the Intel CPU of Broadwell or later #9594

Closed

targos pushed a commit that referenced this pull request Jan 28, 2017

deps: upgrade openssl sources to 1.0.2k

4349a8e

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

italoacasas mentioned this pull request Jan 29, 2017

v7.5.0 proposal #11062

Merged

italoacasas pushed a commit to italoacasas/node that referenced this pull request Jan 30, 2017

deps: upgrade openssl sources to 1.0.2k

6a0f1fa

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: nodejs#11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

MylesBorins pushed a commit that referenced this pull request Jan 30, 2017

deps: upgrade openssl sources to 1.0.2k

3f2bef6

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

MylesBorins pushed a commit that referenced this pull request Jan 31, 2017

deps: upgrade openssl sources to 1.0.2k

c808447

This replaces all sources of openssl-1.0.2k.tar.gz into deps/openssl/openssl PR-URL: #11021 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

MylesBorins mentioned this pull request Jan 31, 2017

2017-01-31, Version 6.9.5 'Boron' (LTS) #11081

Merged

MylesBorins mentioned this pull request Jan 31, 2017

2017-01-31, Version 4.7.3 'Argon' (LTS) #11083

Merged

MylesBorins added land-on-v4.x and removed lts-watch-v4.x labels Jul 14, 2017

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Upgrade to openssl-1.0.2k#11021

Upgrade to openssl-1.0.2k#11021
shigeki wants to merge 7 commits into
nodejs:masterfrom
shigeki:upgrade_openssl102k

shigeki commented Jan 26, 2017

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

bnoordhuis left a comment

Uh oh!

indutny left a comment

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

indutny commented Jan 26, 2017

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

indutny commented Jan 26, 2017

Uh oh!

targos commented Jan 28, 2017

Uh oh!

Fishrock123 commented Feb 2, 2017

Uh oh!

shigeki commented Feb 2, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

shigeki commented Jan 26, 2017

Checklist

Affected core subsystem(s)

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

bnoordhuis left a comment

Choose a reason for hiding this comment

Uh oh!

indutny left a comment

Choose a reason for hiding this comment

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

indutny commented Jan 26, 2017

Uh oh!

shigeki commented Jan 26, 2017

Uh oh!

indutny commented Jan 26, 2017

Uh oh!

targos commented Jan 28, 2017

Uh oh!

Fishrock123 commented Feb 2, 2017

Uh oh!

shigeki commented Feb 2, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants