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

Openssl update v5 #6552

Merged
merged 8 commits into from
May 4, 2016
Merged

Openssl update v5 #6552

merged 8 commits into from
May 4, 2016

Conversation

MylesBorins
Copy link
Contributor

Checklist
  • tests and code linting passes
  • a test and/or benchmark is included
  • documentation is changed or added
  • the commit message follows commit guidelines
Affected core subsystem(s)

tls/crypto

Description of change

openssl sources are upgraded to 1.0.2h and applied floating patches.
Two more works was made in this upgrade.

  • asm regenerated

asm codes were changed in this upgrade so that asm and asm_obsolete were regenerated. openssl headers were unchanged so that config/ are not regenerated.

  • ALPN test fixes

openssl/openssl@af2db04 changed some ALPN behaviors. The tests when ALPN has no selection
should be fixed because openssl was changed NPN callback to be invoked in this case.

Fix: #6458
R: @indutny or @bnoordhuis
/cc @jasnell @Fishrock123

@MylesBorins MylesBorins added crypto Issues and PRs related to the crypto subsystem. openssl Issues and PRs related to the OpenSSL dependency. v5.x labels May 3, 2016
@MylesBorins
Copy link
Contributor Author

@MylesBorins
Copy link
Contributor Author

MylesBorins commented May 3, 2016

@shigeki we have 9 failures on centos5

edit: all related to dgram due to time outs

one more run --> https://ci.nodejs.org/job/node-test-commit-linux/3212/

@MylesBorins
Copy link
Contributor Author

Next run was green this looks green to go

@bnoordhuis
Copy link
Member

Rubber-stamp LGTM.

@shigeki
Copy link
Contributor

shigeki commented May 4, 2016

The test failures on the first CI seems to be caused by some other test process that was remained.
LGTM. Thanks.

@bnoordhuis
Copy link
Member

bnoordhuis commented May 4, 2016

Quick comment: this PR brings back a couple of obsolete files that were recently removed in ae24d05.

@evanlucas
Copy link
Contributor

Once this lands, I'll get the v5 release proposal opened

Shigeki Ohtsu and others added 8 commits May 4, 2016 10:11
This replaces all sources of openssl-1.0.2h.tar.gz into
deps/openssl/openssl

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
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#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
`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-4.8.4. Also asm files in asm_obsolete dir to support old compiler
and assembler are regenerated without CC and ASM envs.

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
openssl/openssl@af2db04
changed some ALPN behaviors. The tests when ALPN has no selection
should be fixed because openssl was changed NPN callback to be invoked
in this case.

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
@MylesBorins MylesBorins merged commit bec5d50 into nodejs:v5.x May 4, 2016
evanlucas added a commit that referenced this pull request May 5, 2016
Notable changes

* deps:
  * upgrade openssl sources to 1.0.2h (Shigeki Ohtsu) [#6552](#6552)
evanlucas added a commit that referenced this pull request May 5, 2016
Notable changes

* buffer: safeguard against accidental kNoZeroFill (Сковорода Никита Андреевич) [nodejs/node-private#35](https://github.com/nodejs/node-private/pull/35)
* deps: upgrade openssl sources to 1.0.2h (Shigeki Ohtsu) [#6552](#6552)
evanlucas added a commit that referenced this pull request May 5, 2016
Notable changes

* buffer: safeguard against accidental kNoZeroFill (Сковорода Никита Андреевич) [nodejs/node-private#35](https://github.com/nodejs/node-private/pull/35)
* deps: upgrade openssl sources to 1.0.2h (Shigeki Ohtsu) [#6552](#6552)
@MylesBorins MylesBorins deleted the openssl-update-v5 branch May 12, 2016 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
crypto Issues and PRs related to the crypto subsystem. openssl Issues and PRs related to the OpenSSL dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants