[v10.x] openssl 1.1.1g by sam-github · Pull Request #32982 · nodejs/node

sam-github · 2020-04-21T20:03:45Z

Backport-of: #32971

I had to cherry-pick 1.1.1f before 1.1.1g, and regenerate the config, no other edits were required.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
documentation is changed or added
commit message follows commit guidelines

sam-github · 2020-04-21T23:25:23Z

Pushed a fixup --- some files that are present on 12.x were here, and didn't get regenerated because 10.x doesn't use them. I rm -rfed deps/openssl/config/arch, and then regenerated the config again, and it looks they are gone.

sam-github · 2020-04-21T23:36:10Z

There was a comment here about conflict markers, but it got deleted or something? Not sure why it was in my email but not visible here. Anyhow, whoever that was, thanks for noticing.

nodejs-github-bot · 2020-04-21T23:36:59Z

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

JesuHrz · 2020-04-22T03:17:59Z

Hey @sam-github , it was me who I deleted it because I was afraid I was wrong.
Anyhow, you're welcome 👍

sam-github · 2020-04-22T15:57:06Z

You were correct, though the files aren't used so it wouldn't have caused issues, but it wasn't intended or tidy. And hey, we've all been wrong on github before, its no big deal even if you were, if something doesn't make sense to you, this is the place to ask.

nodejs-github-bot · 2020-04-27T14:33:04Z

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

This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz $ mv openssl-1.1.0h openssl $ git add --all openssl $ git commit openssl PR-URL: nodejs#32583 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1g.tar.gz $ mv openssl-1.1.1g openssl $ git add --all openssl $ git commit openssl

After an OpenSSL source update, all the config files need to be regenerated and committed by: $ cd deps/openssl/config $ make $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/include/crypto/bn_conf.h $ git add deps/openssl/openssl/include/crypto/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit

nodejs-github-bot · 2020-07-01T13:17:58Z

CI: https://ci.nodejs.org/job/node-test-pull-request/32184/ (💛)

This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz $ mv openssl-1.1.0h openssl $ git add --all openssl $ git commit openssl Backport-PR-URL: #32982 PR-URL: #32583 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1g.tar.gz $ mv openssl-1.1.1g openssl $ git add --all openssl $ git commit openssl PR-URL: #32982 Reviewed-By: Richard Lau <riclau@uk.ibm.com>

After an OpenSSL source update, all the config files need to be regenerated and committed by: $ cd deps/openssl/config $ make $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/include/crypto/bn_conf.h $ git add deps/openssl/openssl/include/crypto/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit PR-URL: #32982 Reviewed-By: Richard Lau <riclau@uk.ibm.com>

richardlau · 2020-07-01T14:45:37Z

Landed in aaf2f82...745b329.

Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) [#32982](#32982) - n-api: * add `napi_detach_arraybuffer` (legendecas) [#29768](#29768)

Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) #32982 - n-api: * add `napi_detach_arraybuffer` (legendecas) #29768

Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) #32982 - n-api: - add `napi_detach_arraybuffer` (legendecas) #29768 PR-URL: #34170

Notable changes: - deps: - upgrade npm to 6.14.6 (claudiahdz) #34246 - upgrade openssl sources to 1.1.1g (Hassaan Pasha) #32982 - n-api: - add `napi_detach_arraybuffer` (legendecas) #29768 PR-URL: #34170

nodejs-github-bot added openssl Issues and PRs related to the OpenSSL dependency. v10.x labels Apr 21, 2020

sam-github mentioned this pull request Apr 21, 2020
deps: update openssl to openssl1.1.1g #32971
Closed
4 tasks

BethGriggs force-pushed the v10.x-staging branch from a85721a to 145dcc2Compare June 2, 2020 18:16

sam-github mentioned this pull request Jun 3, 2020
[v10.x] Openssl 1.1.1f #32601
Closed
4 tasks

hassaanp added 3 commits July 1, 2020 09:14

deps: upgrade openssl sources to 1.1.1g
9c5a36a
This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1g.tar.gz $ mv openssl-1.1.1g openssl $ git add --all openssl $ git commit openssl

richardlau force-pushed the openssl1.1.1g-v10.x branch from 79e338d to 51b43b2Compare July 1, 2020 13:16

richardlau approved these changes Jul 1, 2020
View reviewed changes

richardlau closed this Jul 1, 2020

richardlau mentioned this pull request Jul 2, 2020
v10.22.0 proposal #34170
Merged
4 tasks

richardlau added a commit that referenced this pull request Jul 2, 2020
2020-07-21, Version 10.22.0 'Dubnium' (LTS)
5cf3b31
Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) [#32982](#32982) - n-api: * add `napi_detach_arraybuffer` (legendecas) [#29768](#29768)

richardlau added a commit that referenced this pull request Jul 6, 2020
2020-07-21, Version 10.22.0 'Dubnium' (LTS)
6a26d1e
Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) #32982 - n-api: * add `napi_detach_arraybuffer` (legendecas) #29768

richardlau added a commit that referenced this pull request Jul 7, 2020
2020-07-21, Version 10.22.0 'Dubnium' (LTS)
b4ac3b1
Notable changes: - deps: - upgrade openssl sources to 1.1.1g (Hassaan Pasha) #32982 - n-api: - add `napi_detach_arraybuffer` (legendecas) #29768 PR-URL: #34170

Navigation Menu

Uh oh!

Uh oh!

[v10.x] openssl 1.1.1g - #32982

[v10.x] openssl 1.1.1g#32982
sam-github wants to merge 3 commits into
nodejs:v10.x-stagingfrom
sam-github:openssl1.1.1g-v10.x

sam-github commented Apr 21, 2020

Uh oh!

sam-github commented Apr 21, 2020

Uh oh!

sam-github commented Apr 21, 2020

Uh oh!

nodejs-github-bot commented Apr 21, 2020

Uh oh!

JesuHrz commented Apr 22, 2020•
edited
Loading

Uh oh!

sam-github commented Apr 22, 2020

Uh oh!

nodejs-github-bot commented Apr 27, 2020

Uh oh!

nodejs-github-bot commented Jul 1, 2020•
edited by richardlau
Loading

Uh oh!

richardlau commented Jul 1, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

sam-github commented Apr 21, 2020

Checklist

Uh oh!

sam-github commented Apr 21, 2020

Uh oh!

sam-github commented Apr 21, 2020

Uh oh!

nodejs-github-bot commented Apr 21, 2020

Uh oh!

JesuHrz commented Apr 22, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sam-github commented Apr 22, 2020

Uh oh!

nodejs-github-bot commented Apr 27, 2020

Uh oh!

nodejs-github-bot commented Jul 1, 2020• edited by richardlau Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

richardlau commented Jul 1, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

JesuHrz commented Apr 22, 2020•
edited
Loading

nodejs-github-bot commented Jul 1, 2020•
edited by richardlau
Loading