crypto: use check macros in CipherBase::SetAuthTag #9395
Closed
Conversation
This file contains 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
nodejs-github-bot
added
the
c++
addaleax
reviewed
Nov 1, 2016
|
|
||
| if (!buf->IsObject() || !Buffer::HasInstance(buf)) | ||
| return env->ThrowTypeError("Auth tag must be a Buffer"); | ||
| THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "AAD"); |
There was a problem hiding this comment.
AAD? I guess this line is copypasted, maybe this should be tag or tagbuf?
There was a problem hiding this comment.
Fixed. Should be "Auth tag".
Thank you.
fanatid
force-pushed
the
crypto/SetAuthTag
branch
from
3a0d076 to
5d01b27
Compare
cjihrig
approved these changes
Nov 1, 2016
jasnell
added
the
semver-major
jasnell
reviewed
Nov 2, 2016
|
|
||
| CipherBase* cipher; | ||
| ASSIGN_OR_RETURN_UNWRAP(&cipher, args.Holder()); | ||
|
|
||
| if (!cipher->SetAuthTag(Buffer::Data(buf), Buffer::Length(buf))) |
There was a problem hiding this comment.
Note that the SPREAD_BUFFER_ARG macro has been moved to util.h now and could likely be used to simplify this also.
jasnell
reviewed
Nov 2, 2016
|
|
||
| if (!buf->IsObject() || !Buffer::HasInstance(buf)) | ||
| return env->ThrowTypeError("Auth tag must be a Buffer"); | ||
| THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "Auth tag"); |
There was a problem hiding this comment.
There is a very subtle change in the error message here given that Buffer is changed to buffer. Unfortunately this means this has to be treated as a semver-major because it's a change in the error message. whee!
jasnell
approved these changes
Jan 11, 2017
jasnell
pushed a commit
that referenced
this pull request
Jan 11, 2017
PR-URL: #9395 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
|
Landed in 1ef401c |
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Jan 18, 2017
PR-URL: nodejs#9395 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
Affected core subsystem(s)
crypto
Description of change
Use macros
THROW_AND_RETURN_IF_NOT_BUFFERinstead separate condition.