diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
| commit | b548a1f11c06ccdfa4f52a539912d22d77ee309e (patch) | |
| tree | 37ff8792ddf09e4805aa3ba76b805923d3c52734 /crypto/cms/cms_env.c | |
| parent | 33fbca83dcd05b77f807fab205c4523b8cfe85b5 (diff) | |
| download | openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.tar.gz | |
free null cleanup finale
Don't check for NULL before calling OPENSSL_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/cms/cms_env.c')
| -rw-r--r-- | crypto/cms/cms_env.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index d146f845e9..e8274beabf 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -404,8 +404,7 @@ static int cms_RecipientInfo_ktri_encrypt(CMS_ContentInfo *cms, EVP_PKEY_CTX_free(pctx); ktri->pctx = NULL; } - if (ek) - OPENSSL_free(ek); + OPENSSL_free(ek); return ret; } @@ -472,7 +471,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms, err: EVP_PKEY_CTX_free(ktri->pctx); ktri->pctx = NULL; - if (!ret && ek) + if (!ret) OPENSSL_free(ek); return ret; @@ -712,7 +711,7 @@ static int cms_RecipientInfo_kekri_encrypt(CMS_ContentInfo *cms, err: - if (!r && wkey) + if (!r) OPENSSL_free(wkey); OPENSSL_cleanse(&actx, sizeof(actx)); @@ -785,7 +784,7 @@ static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms, err: - if (!r && ukey) + if (!r) OPENSSL_free(ukey); OPENSSL_cleanse(&actx, sizeof(actx)); |