Optimize out unneeded up_ref/free of EVP_CIPHER

Fixes #22189 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #22198) (cherry picked from commit 8ed76c6)
openssl · Oct 5, 2023 · 1c01dbc · 1c01dbc
1 parent 8110612
commit 1c01dbc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
@@ -192,7 +192,12 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
 #endif
     }
 
-    if (cipher->prov != NULL) {
+    if (!ossl_assert(cipher->prov != NULL)) {
+        ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+        return 0;
+    }
+
+    if (cipher != ctx->fetched_cipher) {
         if (!EVP_CIPHER_up_ref((EVP_CIPHER *)cipher)) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
             return 0;