aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/evp/bio_enc.c
diff options
context:
space:
mode:
authorNeil Horman <nhorman@openssl.org>2023-12-09 13:40:01 -0500
committerNeil Horman <nhorman@openssl.org>2024-01-25 08:27:53 -0500
commit6f22bcd631ab622c2436bc5b299ba2677c388375 (patch)
treee62244a2a0e8f491ab3e3b582928dbc6383f7abf /crypto/evp/bio_enc.c
parentff78d94b131d7bb3b761509d3ce0dd864b1420e3 (diff)
downloadopenssl-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 'crypto/evp/bio_enc.c')
-rw-r--r--crypto/evp/bio_enc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index ece3f6d57f..fc6eec7764 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -132,6 +132,10 @@ static int enc_read(BIO *b, char *out, int outl)
}
blocksize = EVP_CIPHER_CTX_get_block_size(ctx->cipher);
+
+ if (blocksize == 0)
+ return 0;
+
if (blocksize == 1)
blocksize = 0;