Skip to content

crypto: simplify exportKeyingMaterial#31922

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
Closed
tniessen wants to merge 2 commits into from
Closed

crypto: simplify exportKeyingMaterial #31922

tniessen wants to merge 2 commits into from

Conversation

@tniessen
Copy link
Member

@tniessentniessen commented Feb 23, 2020

  1. Use bool instead of int.
  2. Don't call Buffer::HasInstance. We shouldn't silently ignore non-buffers, and ByteSource::FromBuffer will CHECK that the input is a Buffer anyway.
  3. Rename key to context, because that's what it is.
  4. Rename useContext to use_context for consistency with the rest of node_crypto.cc.
  5. Use IsUndefined instead of IsNull, because the JavaScript layer will always either pass undefined or a Buffer.
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@tniessentniessen added crypto Issues and PRs related to the crypto subsystem. c++ Issues and PRs that require attention from people who are familiar with C++. labels Feb 23, 2020
addaleax
addaleax approved these changes Feb 24, 2020
View reviewed changes
@tniessen@addaleax
Update src/node_crypto.cc
8a70768
Co-Authored-By: Anna Henningsen <[email protected]>
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Feb 29, 2020

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

@Trott
Copy link
Member

Trott commented Mar 1, 2020

Landed in 51cae73

Trott pushed a commit that referenced this pull request Mar 1, 2020
@tniessen@Trott
crypto: simplify exportKeyingMaterial
51cae73
PR-URL: #31922 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: David Carlier <[email protected]>
@TrottTrott closed this Mar 1, 2020
MylesBorins pushed a commit that referenced this pull request Mar 4, 2020
@tniessen@MylesBorins
crypto: simplify exportKeyingMaterial
0fc45f8
PR-URL: #31922 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: David Carlier <[email protected]>
@MylesBorinsMylesBorins mentioned this pull request Mar 4, 2020
Merged
@targos
Copy link
Member

targos commented Apr 20, 2020

depends on #31814 to land on v12.x

targos pushed a commit to targos/node that referenced this pull request Apr 25, 2020
@tniessen@targos
crypto: simplify exportKeyingMaterial
cfaa156
PR-URL: nodejs#31922 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: David Carlier <[email protected]>
targos pushed a commit that referenced this pull request Apr 28, 2020
@tniessen@targos
crypto: simplify exportKeyingMaterial
0847bc3
PR-URL: #31922 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: David Carlier <[email protected]>
@targostargos mentioned this pull request May 2, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@targostargostargos left review comments

@jasnelljasnelljasnell approved these changes

@addaleaxaddaleaxaddaleax approved these changes

@cjihrigcjihrigcjihrig approved these changes

+1 more reviewer

@devnexendevnexendevnexen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c++Issues and PRs that require attention from people who are familiar with C++.cryptoIssues and PRs related to the crypto subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@tniessen@nodejs-github-bot@Trott@targos@jasnell@addaleax@cjihrig@devnexen