diff options
| author | Trust-Worthy <[email protected]> | 2026-09-30 00:06:16 +0200 |
|---|---|---|
| committer | Tomas Mraz <[email protected]> | 2026-10-21 18:59:44 +0200 |
| commit | fc4e557ecb6406e421d452ce620d14fedecc4368 (patch) | |
| tree | ec9a505027148ccf095cc2e7d94b107f75fff30f | |
| parent | CI: run zero-yield jobs nightly instead of on every push (diff) | |
| download | openssl-fc4e557ecb6406e421d452ce620d14fedecc4368.tar.gz openssl-fc4e557ecb6406e421d452ce620d14fedecc4368.zip | |
AES-OCB: reject a NULL input to update
EVP_EncryptUpdate() with a NULL input buffer and a nonzero length read
from the NULL pointer in CRYPTO_ocb128_aad(), a NULL-pointer dereference
detected by ASan. Reject the call instead.
Assisted-by: Claude:claude-opus-5-5
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Merge-date: Wed Oct 21 16:59:57 2026
Merged-from: https://github.com/openssl/openssl/pull/33157
| -rw-r--r-- | providers/implementations/ciphers/cipher_aes_ocb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 433e0265980..bb7231dd8a4 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -251,6 +251,11 @@ static int aes_ocb_block_update(void *vctx, unsigned char *out, size_t *outl, return 1; } + if (in == NULL) { + ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + /* Are we dealing with AAD or normal data here? */ if (out == NULL) { buf = ctx->aad_buf; |