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.

Sign up for GitHub

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

Jump to bottom

Enhance crypto/hash.js coverage #17447

Closed
wants to merge 7 commits into from
Closed

Enhance crypto/hash.js coverage #17447

wants to merge 7 commits into from

Conversation

Leko
Copy link
Contributor

@Leko Leko commented Dec 4, 2017

Added these case

crypto.Hash
  • Call constructor without new keyword
crypto.Hmac
  • Call constructor without new keyword
  • Call constructor with typeof hmac != string
  • Call constructor with typeof hmac = string, typeof key != string

Current coverage is here: https://coverage.nodejs.org/coverage-06e1b0386196f8f8/root/internal/crypto/hash.js.html

I cannot write test case: this._handle.update returns false in Hash#verify.
Because I don't know how to make mdctx_ to nullptr in Hash::HashUpdate.
See also:

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

test

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Dec 4, 2017
@Leko Leko changed the title Add missing test in crypto hash hmac Enhance crypto/hash.js coverage Dec 4, 2017
@mscdex mscdex added the crypto Issues and PRs related to the crypto subsystem. label Dec 4, 2017
@lpinca
Copy link
Member

lpinca commented Dec 4, 2017

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

apapirovski
apapirovski approved these changes Dec 4, 2017
View reviewed changes
Copy link
Member

@apapirovski apapirovski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but two small changes needed before this lands

test/parallel/test-crypto-hash.js
{
const Hash = crypto.Hash;
const instance = crypto.Hash('sha256');
assert(instance instanceof Hash, 'Hash is expected to return a new instance' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a space either at the end of this line (after instance) or on the next line. Right now it says "instancewhen".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, Sorry. I'll update it soon.

test/parallel/test-crypto-hmac.js
{
const Hmac = crypto.Hmac;
const instance = crypto.Hmac('sha256', 'Node');
assert(instance instanceof Hmac, 'Hmac is expected to return a new instance' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

@Leko
test: add space after new line
380a158 
Right now it says "instance when".
mhdawson
mhdawson approved these changes Dec 4, 2017
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once changes from @apapirovski are incorporated

@maclover7
Copy link
Contributor

Same deal as #17458 (comment), are we able to use the create functions here?

maclover7
maclover7 approved these changes Dec 5, 2017
View reviewed changes
Copy link
Contributor

@maclover7 maclover7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two quick nits, then LGTM

test/parallel/test-crypto-hmac.js
@@ -6,6 +6,30 @@ if (!common.hasCrypto)
const assert = require('assert');
const crypto = require('crypto');

{
const Hmac = crypto.Hmac;
const instance = crypto.Hmac('sha256', 'Node');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

createHmac

test/parallel/test-crypto-hash.js

{
const Hash = crypto.Hash;
const instance = crypto.Hash('sha256');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

createHash

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same adobe #17458 (comment)

BridgeAR
BridgeAR approved these changes Dec 6, 2017
View reviewed changes
Copy link
Member

@BridgeAR BridgeAR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with @apapirovski comments addressed

@apapirovski
Copy link
Member

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

@maclover7
Copy link
Contributor

@apapirovski Can you confirm your comments were addressed?

@apapirovski
Copy link
Member

Yes and I'm currently landing this

@apapirovski
Copy link
Member

Landed in 3d64533

Thanks @Leko! 👍

@apapirovski apapirovski closed this Dec 7, 2017
apapirovski pushed a commit that referenced this pull request Dec 7, 2017
@Leko @apapirovski
test: expand coverage for crypto
3d64533 
crypto.Hash
- Call constructor without new keyword

crypto.Hmac
- Call constructor without new keyword
- Call constructor with typeof hmac != string
- Call constructor with typeof hmac = string, typeof key != string

PR-URL: #17447
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Dec 12, 2017
@Leko @MylesBorins
test: expand coverage for crypto
e50ab91 
crypto.Hash
- Call constructor without new keyword

crypto.Hmac
- Call constructor without new keyword
- Call constructor with typeof hmac != string
- Call constructor with typeof hmac = string, typeof key != string

PR-URL: #17447
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Dec 12, 2017
@Leko @MylesBorins
test: expand coverage for crypto
a407a48 
crypto.Hash
- Call constructor without new keyword

crypto.Hmac
- Call constructor without new keyword
- Call constructor with typeof hmac != string
- Call constructor with typeof hmac = string, typeof key != string

PR-URL: #17447
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@MylesBorins MylesBorins mentioned this pull request Dec 12, 2017
Merged
@Leko Leko mentioned this pull request Dec 18, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apapirovski apapirovski apapirovski approved these changes

@lpinca lpinca lpinca approved these changes

@maclover7 maclover7 maclover7 approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

@mhdawson mhdawson mhdawson approved these changes

Assignees
No one assigned
Labels
crypto Issues and PRs related to the crypto subsystem. test Issues and PRs related to the tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Leko @lpinca @maclover7 @apapirovski @BridgeAR @mhdawson @mscdex @gibfahn @nodejs-github-bot