[v10.x Backport] Backport crypto fix to v10 - #37009
Closed
evanlucas wants to merge 2 commits into
Closed
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
@nodejs/lts |
Sorry, something went wrong.
This comment has been minimized.
richardlau
approved these changes
Jan 21, 2021
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
richardlau
reviewed
Jan 21, 2021
Comment thread
test/parallel/test-crypto-hash-stream-pipe.js
Outdated
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
This fails when linked against openssl 1.1.0: https://ci.nodejs.org/job/node-test-commit-linux-containered/nodes=ubuntu1804_sharedlibs_openssl110_x64/24809/
15:30:02 not ok 393 parallel/test-crypto-hash-stream-pipe 15:30:02 --- 15:30:02 duration_ms: 0.138 15:30:02 severity: fail 15:30:02 exitcode: 1 15:30:02 stack: |- 15:30:02 internal/crypto/hash.js:33 15:30:02 this._handle = new _Hash(algorithm); 15:30:02 ^ 15:30:02 15:30:02 Error: Digest method not supported 15:30:02 at new Hash (internal/crypto/hash.js:33:18) 15:30:02 at Object.createHash (crypto.js:101:10) 15:30:02 at Object.<anonymous> (/home/iojs/build/workspace/node-test-commit-linux-containered/test/parallel/test-crypto-hash-stream-pipe.js:33:18) 15:30:02 at Module._compile (internal/modules/cjs/loader.js:778:30) 15:30:02 at Object.Module._extensions..js (internal/modules/cjs/loader.js:789:10) 15:30:02 at Module.load (internal/modules/cjs/loader.js:653:32) 15:30:02 at tryModuleLoad (internal/modules/cjs/loader.js:593:12) 15:30:02 at Function.Module._load (internal/modules/cjs/loader.js:585:3) 15:30:02 at Function.Module.runMain (internal/modules/cjs/loader.js:831:12) 15:30:02 at startup (internal/bootstrap/node.js:283:19) 15:30:02 ...
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
oops, I'll amend that shortly. Thanks!
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
sorry that shortly turned into 13 days :[. Should be working now. Thanks!
Sorry, something went wrong.
codebytere
approved these changes
Jan 25, 2021
When piping data into an SHA3 hash, EVP_DigestFinal_ex is called in hash._flush, bypassing safeguards in the JavaScript layer. Calling hash.digest causes EVP_DigestFinal_ex to be called again, resulting in a segmentation fault in the SHA3 implementation of OpenSSL. A relatively easy solution is to cache the result of calling EVP_DigestFinal_ex until the Hash object is garbage collected. PR-URL: nodejs#28251 Fixes: nodejs#28245 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This test fails prior to 990feaf being cherry-picked due to stream.pipeline with a crypto.Hash not working properly. That bug also seems to have affected md5.
evanlucas
force-pushed
the
backport-crypto-fix-to-v10
branch
from
e175973 to
6858287
Compare
February 4, 2021 11:38
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
richardlau
approved these changes
Feb 4, 2021
richardlau
pushed a commit
that referenced
this pull request
Feb 5, 2021
When piping data into an SHA3 hash, EVP_DigestFinal_ex is called in hash._flush, bypassing safeguards in the JavaScript layer. Calling hash.digest causes EVP_DigestFinal_ex to be called again, resulting in a segmentation fault in the SHA3 implementation of OpenSSL. A relatively easy solution is to cache the result of calling EVP_DigestFinal_ex until the Hash object is garbage collected. PR-URL: #28251 Fixes: #28245 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Backport-PR-URL: #37009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Merged
richardlau
pushed a commit
that referenced
this pull request
Feb 8, 2021
When piping data into an SHA3 hash, EVP_DigestFinal_ex is called in hash._flush, bypassing safeguards in the JavaScript layer. Calling hash.digest causes EVP_DigestFinal_ex to be called again, resulting in a segmentation fault in the SHA3 implementation of OpenSSL. A relatively easy solution is to cache the result of calling EVP_DigestFinal_ex until the Hash object is garbage collected. PR-URL: #28251 Fixes: #28245 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Backport-PR-URL: #37009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Copy link
Copy Markdown
Member
|
v10.x-staging was rebased for #37278 so the rebased commit hashes for this PR are 68a6b8d...1c6fbd6 |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This backports 990feafcb to v10.x. This fixes an issue when using stream.pipeline() with an instance of crypto.Hash.
It was fixed in 12.6.0, so this backports to v10.x and adds a test for it.