Don't clean up uninitialised EVP_CIPHER_CTX on error (CID 483259).

(cherry picked from commit c1d1b0114e9d370c30649e46182393dbfc00e20c)

diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index b79612a12df495c6169701833cca935f65713d2e..71f2ddb49695c6df76113d3593804348c2d5de11 100644 (file)
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -93,9 +93,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
        X509_ALGOR *encalg = NULL;
        unsigned char iv[EVP_MAX_IV_LENGTH];
        int ivlen;
        X509_ALGOR *encalg = NULL;
        unsigned char iv[EVP_MAX_IV_LENGTH];
        int ivlen;

+

        env = cms_get0_enveloped(cms);
        if (!env)
        env = cms_get0_enveloped(cms);
        if (!env)

-               goto err;
+               return NULL;

 
        if (wrap_nid <= 0)
                wrap_nid = NID_id_alg_PWRI_KEK;
 
        if (wrap_nid <= 0)
                wrap_nid = NID_id_alg_PWRI_KEK;