diff options
| author | Adel-Ayoub <[email protected]> | 2026-07-03 18:47:50 +0200 |
|---|---|---|
| committer | Norbert Pocs <[email protected]> | 2026-07-27 12:21:09 +0200 |
| commit | 05b65fcb223cd3d899b595d3ec798e134f5f36d6 (patch) | |
| tree | ef8bc4896e264372e38c399edfda83effeee3627 /apps | |
| parent | apps: test dgst -r and -c output formats (diff) | |
| download | openssl-05b65fcb223cd3d899b595d3ec798e134f5f36d6.tar.gz openssl-05b65fcb223cd3d899b595d3ec798e134f5f36d6.zip | |
crypto/pkcs12/p12_decr.c: fix EVP_CIPHER_CTX_ctrl error checks
EVP_CIPHER_CTX_ctrl() reports failure of the EVP_CTRL_AEAD_TLS1_AAD
and EVP_CTRL_AEAD_SET_TAG controls as 0, not as a negative value,
so the "< 0" checks on the cipher-with-MAC path cannot detect any
failure. A return of 0 means a failed or unsupported control, or
for EVP_CTRL_AEAD_TLS1_AAD a zero MAC length, none of which is
usable here.
Change both checks to "<= 0", matching the EVP_CTRL_AEAD_GET_TAG
check fixed by commit 674c23d2656e in this function.
Follow-up to https://github.com/openssl/openssl/pull/30923.
Fixes: ea0add4a8227 "New GOST PKCS12 standard support"
CLA: trivial
Reviewed-by: Dmitry Belyavskiy <[email protected]>
Reviewed-by: Andrew Dinh <[email protected]>
Reviewed-by: Jakub Zelenka <[email protected]>
MergeDate: Mon Jul 27 10:21:13 2026
(Merged from https://github.com/openssl/openssl/pull/31848)
Diffstat (limited to 'apps')
0 files changed, 0 insertions, 0 deletions