Skip to content
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

Jump to bottom

Openssl 1.0.2q #24530

Closed
wants to merge 6 commits into from
Closed

Openssl 1.0.2q #24530

wants to merge 6 commits into from

Conversation

sam-github
Copy link
Contributor

See: #24370

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

sam-github and others added 6 commits November 20, 2018 12:00
@sam-github
deps: upgrade openssl sources to 1.0.2q
0d0df99 
This updates all sources in deps/openssl/openssl with openssl-1.0.2q.
@sam-github
deps: copy all openssl header files to include dir
14b907b 
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.

Header files were generated by:
  $ cd deps/openssl
  $ mkdir -p openssl/include/openssl
  $ tar xf .../openssl-1.02q.tar.gz
  $ cd openssl-1.02q
  $ ./config
  $ cd include/openssl
  $ sed -i '' *.h
  $ cp *.h ../../../openssl/include/openssl/
@indutny @sam-github
deps: fix openssl assembly error on ia32 win32
d5395b2 
`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>
@sam-github
deps: fix asm build error of openssl in x86_win32
10477ea 
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>
@sam-github
openssl: fix keypress requirement in apps on win32
b5c97d5 
Reapply b910613 .

Fixes: nodejs#589
PR-URL: nodejs#1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@sam-github
deps: add -no_rand_screen to openssl s_client
41d986d 
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>
@nodejs-github-bot
Copy link
Collaborator

@sam-github sadly an error occured when I tried to trigger a build :(

@nodejs-github-bot nodejs-github-bot added openssl Issues and PRs related to the OpenSSL dependency. v8.x labels Nov 20, 2018
@sam-github
Copy link
Contributor Author

@nodejs/crypto PTAL

@sam-github
Copy link
Contributor Author

ci: https://ci.nodejs.org/job/node-test-pull-request/18820/

@shigeki shigeki self-requested a review November 21, 2018 10:03
shigeki
shigeki approved these changes Nov 21, 2018
View reviewed changes
Copy link
Contributor

@shigeki shigeki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm little surprised at a new file of crypto/getenv.c was added to even 1.0.2 and it needs to update openssl.gypi.
All changes are fine. Thanks.

@rvagg rvagg mentioned this pull request Nov 22, 2018
Closed
@sam-github
Copy link
Contributor Author

@rvagg @MylesBorins I don't have authorization to land this, I'm not part of the nodejs release team. Whichever one of you is prepping for the 8.x security release will need to.

rvagg pushed a commit that referenced this pull request Nov 23, 2018
@sam-github @rvagg
deps: upgrade openssl sources to 1.0.2q
71cbb34 
This updates all sources in deps/openssl/openssl with openssl-1.0.2q.

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
rvagg pushed a commit that referenced this pull request Nov 23, 2018
@sam-github @rvagg
deps: copy all openssl header files to include dir
97cfa28 
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.

Header files were generated by:
  $ cd deps/openssl
  $ mkdir -p openssl/include/openssl
  $ tar xf .../openssl-1.02q.tar.gz
  $ cd openssl-1.02q
  $ ./config
  $ cd include/openssl
  $ sed -i '' *.h
  $ cp *.h ../../../openssl/include/openssl/

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
rvagg pushed a commit that referenced this pull request Nov 23, 2018
@sam-github @rvagg
deps: upgrade openssl sources to 1.0.2q
76e5c41 
This updates all sources in deps/openssl/openssl with openssl-1.0.2q.

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
rvagg pushed a commit that referenced this pull request Nov 23, 2018
@sam-github @rvagg
deps: copy all openssl header files to include dir
bedf4ad 
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.

Header files were generated by:
  $ cd deps/openssl
  $ mkdir -p openssl/include/openssl
  $ tar xf .../openssl-1.02q.tar.gz
  $ cd openssl-1.02q
  $ ./config
  $ cd include/openssl
  $ sed -i '' *.h
  $ cp *.h ../../../openssl/include/openssl/

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
@rvagg
Copy link
Member

rvagg commented Nov 23, 2018

Landed on v8.x-staging and v6.x-staging, although I'm probably going to have to cherry-pick them out again for the security releases.
Thanks @sam-github

@rvagg rvagg closed this Nov 23, 2018
rvagg pushed a commit that referenced this pull request Nov 24, 2018
@sam-github @rvagg
deps: upgrade openssl sources to 1.0.2q
e567d9b 
This updates all sources in deps/openssl/openssl with openssl-1.0.2q.

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
rvagg pushed a commit that referenced this pull request Nov 24, 2018
@sam-github @rvagg
deps: copy all openssl header files to include dir
4fd0ce6 
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.

Header files were generated by:
  $ cd deps/openssl
  $ mkdir -p openssl/include/openssl
  $ tar xf .../openssl-1.02q.tar.gz
  $ cd openssl-1.02q
  $ ./config
  $ cd include/openssl
  $ sed -i '' *.h
  $ cp *.h ../../../openssl/include/openssl/

PR-URL: #24530
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
@sam-github sam-github deleted the openssl-1.0.2q-v8.x branch May 29, 2019 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danbev danbev danbev approved these changes

@rvagg rvagg rvagg approved these changes

@shigeki shigeki shigeki approved these changes

Assignees
No one assigned
Labels
openssl Issues and PRs related to the OpenSSL dependency.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sam-github @nodejs-github-bot @rvagg @danbev @shigeki @indutny