Fix error return check of EVP_CIPHER_CTX_ctrl() #18987
Closed
+4
−4
Conversation
This file contains hidden or 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
OpenSSL can return -1 on error [1, 2], and OpenBSD's docs confirm this [3]. Existing checks check for 1 for the success value, so do the same. [1] https://github.com/openssl/openssl/blob/b3161bd9a9329be3d6bf6b29a06835e2721898bb/crypto/evp/evp_enc.c#L1530-L1531 [2] https://github.com/openssl/openssl/blob/b3161bd9a9329be3d6bf6b29a06835e2721898bb/crypto/evp/evp_enc.c#L1611 [3] https://man.openbsd.org/EVP_CIPHER_CTX_ctrl.3
bukka
reviewed
Jul 15, 2025
ext/openssl/openssl.c
Outdated
| @@ -7547,15 +7547,15 @@ static int php_openssl_cipher_init(const EVP_CIPHER *cipher_type, | |||
| return FAILURE; | |||
| } | |||
| if (mode->set_tag_length_always || (enc && mode->set_tag_length_when_encrypting)) { | |||
| if (!EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_set_tag_flag, tag_len, NULL)) { | |||
| if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_set_tag_flag, tag_len, NULL) != 1) { | |||
There was a problem hiding this comment.
I just checked OpenSSL checks for EVP_CTRL_AEAD_SET_TAG and it usually uses <= 0 so think we should use that too. There was actually one usage != 1 so it might be safe but I would still prefer <= 0. Also this issue (checking for zero) is present in few places in OpenSSL itself...
bukka
approved these changes
Jul 15, 2025
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.
OpenSSL can return -1 on error [1, 2], and OpenBSD's docs confirm this [3]. Existing checks check for 1 for the success value, so do the same.
[1] https://github.com/openssl/openssl/blob/b3161bd9a9329be3d6bf6b29a06835e2721898bb/crypto/evp/evp_enc.c#L1530-L1531
[2] https://github.com/openssl/openssl/blob/b3161bd9a9329be3d6bf6b29a06835e2721898bb/crypto/evp/evp_enc.c#L1611
[3] https://man.openbsd.org/EVP_CIPHER_CTX_ctrl.3
This is the first batch of potentially a few of these fixes. #18986 prompted me to dig up my old analyzer and re-run it with the combined codebases of PHP and OpenSSL to check for inconsistencies.