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/s3_enc.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/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 54c47dd3f9..d63ea56c33 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -120,6 +120,7 @@ int ssl3_change_cipher_state(SSL_CONNECTION *s, int which) md_len = (size_t)mdi; key_len = EVP_CIPHER_get_key_length(ciph); iv_len = EVP_CIPHER_get_iv_length(ciph); + if ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || (which == SSL3_CHANGE_CIPHER_SERVER_READ)) { mac_secret = &(p[0]); |