★ wanayoo — archive 1999 https://github.com/nodejs/node/pull/28318Nouvelle recherche | Portail wanayoo
Skip to content

/node

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

crypto: move _scrypt call out of handleError funct #28318

Closed
wants to merge 5 commits into from

Conversation

@danbev
Copy link
Member

commented Jun 20, 2019

This commit moves the _scrypt function call out of the handleError
function, which now only takes in an error object as its parameter.

The motivation for this is to hopefully improve readability as it was
not clear to me the first time I stepped through the code where the
actual call to _scrypt was.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
@danbev
crypto: move _scrypt call out of handleError funct 
This commit moves the _scrypt function call out of the handleError
function, which now only takes in an error object as its parameter.

The motivation for this is to hopefully improve readability as it was
not clear to me the first time I stepped through the code where the
actual call to _scrypt was.
Loading status checks…
13b51d2

@nodejs-github-bot nodejs-github-bot added the crypto label Jun 20, 2019

@nodejs-github-bot

This comment has been minimized.

Sign in to view
Copy link

commented Jun 20, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/24000/
@ZYSzys
ZYSzys approved these changes Jun 20, 2019
View changes
@benjamingr
benjamingr approved these changes Jun 20, 2019
View changes
@bnoordhuis
bnoordhuis requested changes Jun 20, 2019
View changes
Copy link
Member

left a comment

If you're going to make this change, you should also make it to pbkdf2.js, random.js and (possibly) keygen.js, otherwise you're introducing style inconsistencies between the files in lib/internal/crypto.
lib/internal/crypto/scrypt.js Outdated Show resolved Hide resolved
@danbev
fixup! crypto: move _scrypt call out of handleError funct
Loading status checks…
ec54953
@danbev

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Jun 20, 2019

f you're going to make this change, you should also make it to pbkdf2.js, random.js and (possibly) keygen.js

Ah I see, let me take a look and update them too. Thanks
danbev added 3 commits Jun 20, 2019
@danbev
crypto: move _randomBytes call out of handleError funct 
This commit moves the _randomBytes function call out of the handleError
function, which now it takes in an error and a buf object as its
parameters.
3b3908d
@danbev
crypto: move _pbkdf2 call out of handleError funct 
This commit moves the _pbkdf2 function call out of the handleError
function, which now only takes in an error and a digest object as
its parameters.
d96eff6
@danbev
crypto: move _impl call out of handleError funct 
This commit moves the _impl function call out of the handleError
function, which now only takes in an object as its parameter.
Loading status checks…
247df3c
@nodejs-github-bot

This comment has been minimized.

Sign in to view
Copy link

commented Jun 20, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/24004/
@addaleax
addaleax approved these changes Jun 20, 2019
View changes
@bnoordhuis
bnoordhuis approved these changes Jun 21, 2019
View changes
Copy link
Member

left a comment

LGTM although it drops the D in DRY.
@Trott
Trott approved these changes Jun 21, 2019
View changes

@Trott Trott added the author ready label Jun 21, 2019

@nodejs-github-bot

This comment has been minimized.

Sign in to view
Copy link

commented Jun 21, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/24033/
@tniessen
tniessen approved these changes Jun 21, 2019
View changes
@nodejs-github-bot

This comment has been minimized.

Sign in to view
Copy link

commented Jun 21, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/24038/
@jasnell
jasnell approved these changes Jun 23, 2019
View changes
@danbev

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Jun 24, 2019

Landed in 882e8fe, 556b38a, 7edd5f3, and c6f968d.

@danbev danbev closed this Jun 24, 2019

@danbev danbev deleted the danbev:scrypt_handleError branch Jun 24, 2019

danbev added a commit that referenced this pull request Jun 24, 2019
@danbev
crypto: move _scrypt call out of handleError funct 
This commit moves the _scrypt function call out of the handleError
function, which now only takes in an error object as its parameter.

The motivation for this is to hopefully improve readability as it was
not clear to me the first time I stepped through the code where the
actual call to _scrypt was.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
882e8fe
danbev added a commit that referenced this pull request Jun 24, 2019
@danbev
crypto: move _randomBytes call out of handleError funct 
This commit moves the _randomBytes function call out of the handleError
function, which now it takes in an error and a buf object as its
parameters.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
556b38a
danbev added a commit that referenced this pull request Jun 24, 2019
@danbev
crypto: move _pbkdf2 call out of handleError funct 
This commit moves the _pbkdf2 function call out of the handleError
function, which now only takes in an error and a digest object as
its parameters.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
7edd5f3
danbev added a commit that referenced this pull request Jun 24, 2019
@danbev
crypto: move _impl call out of handleError funct 
This commit moves the _impl function call out of the handleError
function, which now only takes in an object as its parameter.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Loading status checks…
c6f968d
jshricarde added a commit to jshricarde/node that referenced this pull request Jun 25, 2019
@danbev @jshricarde
crypto: move _scrypt call out of handleError funct 
This commit moves the _scrypt function call out of the handleError
function, which now only takes in an error object as its parameter.

The motivation for this is to hopefully improve readability as it was
not clear to me the first time I stepped through the code where the
actual call to _scrypt was.

PR-URL: nodejs#28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
a62568a
jshricarde added a commit to jshricarde/node that referenced this pull request Jun 25, 2019
@danbev @jshricarde
crypto: move _randomBytes call out of handleError funct 
This commit moves the _randomBytes function call out of the handleError
function, which now it takes in an error and a buf object as its
parameters.

PR-URL: nodejs#28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
fb0718c
jshricarde added a commit to jshricarde/node that referenced this pull request Jun 25, 2019
@danbev @jshricarde
crypto: move _pbkdf2 call out of handleError funct 
This commit moves the _pbkdf2 function call out of the handleError
function, which now only takes in an error and a digest object as
its parameters.

PR-URL: nodejs#28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
d3d751b
jshricarde added a commit to jshricarde/node that referenced this pull request Jun 25, 2019
@danbev @jshricarde
crypto: move _impl call out of handleError funct 
This commit moves the _impl function call out of the handleError
function, which now only takes in an object as its parameter.

PR-URL: nodejs#28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
a147e34
targos added a commit that referenced this pull request Jul 2, 2019
@danbev @targos
crypto: move _scrypt call out of handleError funct 
This commit moves the _scrypt function call out of the handleError
function, which now only takes in an error object as its parameter.

The motivation for this is to hopefully improve readability as it was
not clear to me the first time I stepped through the code where the
actual call to _scrypt was.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Verified
This commit was signed with a verified signature.
targos Michaël Zasso
GPG key ID: 770F7A9A5AE15600 Learn about signing commits
def96ae
targos added a commit that referenced this pull request Jul 2, 2019
@danbev @targos
crypto: move _randomBytes call out of handleError funct 
This commit moves the _randomBytes function call out of the handleError
function, which now it takes in an error and a buf object as its
parameters.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Verified
This commit was signed with a verified signature.
targos Michaël Zasso
GPG key ID: 770F7A9A5AE15600 Learn about signing commits
47b230a
targos added a commit that referenced this pull request Jul 2, 2019
@danbev @targos
crypto: move _pbkdf2 call out of handleError funct 
This commit moves the _pbkdf2 function call out of the handleError
function, which now only takes in an error and a digest object as
its parameters.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Verified
This commit was signed with a verified signature.
targos Michaël Zasso
GPG key ID: 770F7A9A5AE15600 Learn about signing commits
558e9cf
targos added a commit that referenced this pull request Jul 2, 2019
@danbev @targos
crypto: move _impl call out of handleError funct 
This commit moves the _impl function call out of the handleError
function, which now only takes in an object as its parameter.

PR-URL: #28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Verified
This commit was signed with a verified signature.
targos Michaël Zasso
GPG key ID: 770F7A9A5AE15600 Learn about signing commits
f21ddb2
@targos targos referenced this pull request Jul 2, 2019
Merged
This was referenced Jul 3, 2019
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bnoordhuis bnoordhuis

@jasnell jasnell

@Trott Trott

@addaleax addaleax

@benjamingr benjamingr

@tniessen tniessen

@ZYSzys ZYSzys

Assignees
No one assigned
Labels
author ready crypto
Projects
None yet
Milestone
No milestone
9 participants
@danbev @nodejs-github-bot @bnoordhuis @jasnell @Trott @addaleax @benjamingr @tniessen @ZYSzys
You can’t perform that action at this time.