crypto: fix build without scrypt#40613

shr-project · 2021-10-26T15:37:58Z

add missing semicolon to fix:

In file included from ../src/node_crypto.h:47, from ../src/node.cc:46: ../src/crypto/crypto_scrypt.h:80:2: error: expected ';' after struct definition 80 | } | ^ | ;

and fix typo in the comment

Signed-off-by: Martin Jansa [email protected]

* add missing semicolon to fix: In file included from ../src/node_crypto.h:47, from ../src/node.cc:46: ../src/crypto/crypto_scrypt.h:80:2: error: expected ';' after struct definition 80 | } | ^ | ; and fix typo in the comment Signed-off-by: Martin Jansa <[email protected]>

Fixes: #678 Refs: #26854 Signed-off-by: James M Snell <[email protected]> PR-URL: #35093 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Rich Trott <[email protected]>

nodejs-github-bot · 2021-11-01T20:44:03Z

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

nodejs-github-bot · 2021-11-10T14:29:11Z

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

nodejs-github-bot · 2021-11-10T15:06:25Z

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

nodejs-github-bot · 2021-11-11T16:38:28Z

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

tniessen · 2021-11-11T17:59:54Z

@nodejs/node-core-utils git node land incorrectly picks up a Fixes line here:

----------------------------------- PR info ------------------------------------ Title crypto: fix build without scrypt (#40613) Author Martin 'JaMa' Jansa <[email protected]> (@shr-project, first-time contributor) Branch shr-project:jansa/scrypt -> nodejs:master Labels crypto, c++, author ready Commits 1 - crypto: fix build without scrypt Committers 1 - Martin Jansa <[email protected]> PR-URL: https://github.com/nodejs/node/pull/40613 Fixes: https://github.com/In Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/40613 Fixes: https://github.com/In Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> --------------------------------------------------------------------------------

* add missing semicolon to fix: In file included from ../src/node_crypto.h:47, from ../src/node.cc:46: ../src/crypto/crypto_scrypt.h:80:2: error: expected ';' after struct definition 80 | } | ^ | ; and fix typo in the comment Signed-off-by: Martin Jansa <[email protected]> PR-URL: #40613 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

tniessen · 2021-11-11T18:00:27Z

Landed in a9b2d85, thank you for the contribution, @shr-project!

Trott · 2021-11-11T19:22:20Z

@nodejs/node-core-utils git node land incorrectly picks up a Fixes line here:

----------------------------------- PR info ------------------------------------ Title crypto: fix build without scrypt (#40613) Author Martin 'JaMa' Jansa <[email protected]> (@shr-project, first-time contributor) Branch shr-project:jansa/scrypt -> nodejs:master Labels crypto, c++, author ready Commits 1 - crypto: fix build without scrypt Committers 1 - Martin Jansa <[email protected]> PR-URL: https://github.com/nodejs/node/pull/40613 Fixes: https://github.com/In Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/40613 Fixes: https://github.com/In Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> --------------------------------------------------------------------------------

It's probably because fix: shows up in the commit message. If so, the regex or whatever could certainly be made more strict.

* add missing semicolon to fix: In file included from ../src/node_crypto.h:47, from ../src/node.cc:46: ../src/crypto/crypto_scrypt.h:80:2: error: expected ';' after struct definition 80 | } | ^ | ; and fix typo in the comment Signed-off-by: Martin Jansa <[email protected]> PR-URL: #40613 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Voltrex <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. needs-ci PRs that need a full CI run. labels Oct 26, 2021

shr-project force-pushed the jansa/scrypt branch from 07534f7 to 048203cCompare October 26, 2021 15:41

ejcheng approved these changes Oct 26, 2021
View reviewed changes

tniessen approved these changes Oct 27, 2021
View reviewed changes

VoltrexKeyva approved these changes Oct 27, 2021
View reviewed changes

VoltrexKeyva added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 27, 2021

github-actionsbot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 27, 2021