Skip to content

crypto: fix edge case in authenticated encryption #22828

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

Closed
tniessen wants to merge 3 commits into from
Closed

crypto: fix edge case in authenticated encryption #22828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57c0dbe
crypto: fix edge case in authenticated encryption
tniessen Sep 12, 2018
520717b
Match old behavior when called multiple times
tniessen Sep 14, 2018
994d6b7
Remove redundant state
tniessen Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove redundant state
  • Loading branch information
@tniessen
tniessen committed Sep 14, 2018
commit 994d6b7c249a12125fce8b4fbe27102ed24115f3
2 changes: 0 additions & 2 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2818,7 +2818,6 @@ bool CipherBase::InitAuthenticated(const char* cipher_type, int iv_len,

// Remember the given authentication tag length for later.
auth_tag_len_ = auth_tag_len;
auth_tag_state_ = kAuthTagLengthKnown;

if (mode == EVP_CIPH_CCM_MODE) {
// Restrict the message length to min(INT_MAX, 2^(8*(15-iv_len))-1) bytes.
Expand All @@ -2841,7 +2840,6 @@ bool CipherBase::InitAuthenticated(const char* cipher_type, int iv_len,

// Remember the given authentication tag length for later.
auth_tag_len_ = auth_tag_len;
auth_tag_state_ = kAuthTagLengthKnown;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/node_crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@ class CipherBase : public BaseObject {
};
enum AuthTagState {
kAuthTagUnknown,
kAuthTagLengthKnown,
kAuthTagKnown,
kAuthTagPassedToOpenSSL
};
Expand Down