[v10.x] openssl 1.1.1g - #32982
Conversation
Sorry, something went wrong.
|
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. |
Sorry, something went wrong.
|
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. |
Sorry, something went wrong.
Sorry, something went wrong.
|
Hey @sam-github , it was me who I deleted it because I was afraid I was wrong. |
Sorry, something went wrong.
|
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. |
Sorry, something went wrong.
Sorry, something went wrong.
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
Sorry, something went wrong.
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>
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