From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 19 Aug 2022 10:28:42 +0000 (+0200)
Subject: rl->enc_ctx must be non-NULL and cipher must be set
X-Git-Tag: openssl-3.2.0-alpha1~2172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35bcac131ce5605c504d48a077f33f69660b660c;p=thirdparty%2Fopenssl.git

rl->enc_ctx must be non-NULL and cipher must be set

Otherwise ssl3_cipher() cannot work properly.

Fixes Coverity CID 1509401

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19027)
---

diff --git a/ssl/record/methods/ssl3_meth.c b/ssl/record/methods/ssl3_meth.c
index 254e8cf1476..f1fd1f42031 100644
--- a/ssl/record/methods/ssl3_meth.c
+++ b/ssl/record/methods/ssl3_meth.c
@@ -98,10 +98,8 @@ static int ssl3_cipher(OSSL_RECORD_LAYER *rl, SSL3_RECORD *inrecs, size_t n_recs
         return 0;
 
     ds = rl->enc_ctx;
-    if (rl->enc_ctx == NULL)
-        enc = NULL;
-    else
-        enc = EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx);
+    if (ds == NULL || (enc = EVP_CIPHER_CTX_get0_cipher(ds)) == NULL)
+        return 0;
 
     provided = (EVP_CIPHER_get0_provider(enc) != NULL);