Skip to content

fix: use proper return value check for EVP_CIPHER_CTX_ctrl() #36

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

Open
ndossche wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use proper return value check for EVP_CIPHER_CTX_ctrl() #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/ncrypto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3403,19 +3403,19 @@ bool CipherCtxPointer::setKeyLength(size_t length) {
bool CipherCtxPointer::setIvLength(size_t length) {
if (!ctx_) return false;
return EVP_CIPHER_CTX_ctrl(
ctx_.get(), EVP_CTRL_AEAD_SET_IVLEN, length, nullptr);
ctx_.get(), EVP_CTRL_AEAD_SET_IVLEN, length, nullptr) > 0;
}

bool CipherCtxPointer::setAeadTag(const Buffer<const char>& tag) {
if (!ctx_) return false;
return EVP_CIPHER_CTX_ctrl(
ctx_.get(), EVP_CTRL_AEAD_SET_TAG, tag.len, const_cast<char*>(tag.data));
ctx_.get(), EVP_CTRL_AEAD_SET_TAG, tag.len, const_cast<char*>(tag.data)) > 0;
}

bool CipherCtxPointer::setAeadTagLength(size_t length) {
if (!ctx_) return false;
return EVP_CIPHER_CTX_ctrl(
ctx_.get(), EVP_CTRL_AEAD_SET_TAG, length, nullptr);
ctx_.get(), EVP_CTRL_AEAD_SET_TAG, length, nullptr) > 0;
}

bool CipherCtxPointer::setPadding(bool padding) {
Expand Down Expand Up @@ -3485,7 +3485,7 @@ bool CipherCtxPointer::update(const Buffer<const unsigned char>& in,

bool CipherCtxPointer::getAeadTag(size_t len, unsigned char* out) {
if (!ctx_) return false;
return EVP_CIPHER_CTX_ctrl(ctx_.get(), EVP_CTRL_AEAD_GET_TAG, len, out);
return EVP_CIPHER_CTX_ctrl(ctx_.get(), EVP_CTRL_AEAD_GET_TAG, len, out) > 0;
}

// ============================================================================
Expand Down
Loading