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

[v10.x] openssl 1.1.1g

Closed

Conversation

sam-github
Copy link
Contributor

@sam-github sam-github commented Apr 21, 2020

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

@nodejs-github-bot nodejs-github-bot added openssl v10.x labels Apr 21, 2020
@sam-github
Copy link
Contributor Author

sam-github commented Apr 21, 2020

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
Copy link
Contributor Author

sam-github commented Apr 21, 2020

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
Copy link
Contributor

nodejs-github-bot commented Apr 21, 2020

@JesuHrz
Copy link
Contributor

JesuHrz commented Apr 22, 2020

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

@sam-github
Copy link
Contributor Author

sam-github commented Apr 22, 2020

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
Copy link
Contributor

nodejs-github-bot commented Apr 27, 2020

hassaanp added 3 commits Jul 1, 2020
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
Copy link
Contributor

nodejs-github-bot commented Jul 1, 2020

richardlau pushed a commit that referenced this issue Jul 1, 2020
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>
richardlau pushed a commit that referenced this issue Jul 1, 2020
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>
richardlau pushed a commit that referenced this issue Jul 1, 2020
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
Copy link
Member

richardlau commented Jul 1, 2020

Landed in aaf2f82...745b329.

@richardlau richardlau closed this Jul 1, 2020
@richardlau richardlau mentioned this pull request Jul 2, 2020
4 tasks
richardlau added a commit that referenced this issue Jul 2, 2020
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 issue Jul 6, 2020
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 issue Jul 7, 2020
Notable changes:

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

PR-URL: #34170
richardlau added a commit that referenced this issue Jul 13, 2020
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
richardlau added a commit that referenced this issue Jul 15, 2020
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
BethGriggs pushed a commit that referenced this issue Jul 21, 2020
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
cjihrig pushed a commit that referenced this issue Jul 23, 2020
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
openssl
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants