diff options
author | Neil Horman <nhorman@openssl.org> | 2023-12-09 13:40:01 -0500 |
---|---|---|
committer | Neil Horman <nhorman@openssl.org> | 2024-01-25 08:27:53 -0500 |
commit | 6f22bcd631ab622c2436bc5b299ba2677c388375 (patch) | |
tree | e62244a2a0e8f491ab3e3b582928dbc6383f7abf /ssl/ssl_ciph.c | |
parent | ff78d94b131d7bb3b761509d3ce0dd864b1420e3 (diff) | |
download | openssl-6f22bcd631ab622c2436bc5b299ba2677c388375.tar.gz |
Add appropriate NULL checks in EVP_CIPHER api
The EVP_CIPHER api currently assumes that calls made into several APIs
have already initalized the cipher in a given context via a call to
EVP_CipherInit[_ex[2]]. If that hasnt been done, instead of an error,
the result is typically a SIGSEGV.
Correct that by adding missing NULL checks in the apropriate apis prior
to using ctx->cipher
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22995)
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r-- | ssl/ssl_ciph.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 31c0d5af1d..6e49d6b400 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -2221,6 +2221,8 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead, in = 1; /* padding length byte */ out = EVP_CIPHER_get_iv_length(e_ciph); blk = EVP_CIPHER_get_block_size(e_ciph); + if (blk == 0) + return 0; } } |