projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
free null cleanup finale
[openssl.git]
/
crypto
/
cms
/
cms_env.c
diff --git
a/crypto/cms/cms_env.c
b/crypto/cms/cms_env.c
index d146f845e9042ab1c1aea46e5143760069891192..e8274beabfe3ab1b85ed78e5d6579246c1076428 100644
(file)
--- 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;
}
EVP_PKEY_CTX_free(pctx);
ktri->pctx = NULL;
}
- if (ek)
- OPENSSL_free(ek);
+ OPENSSL_free(ek);
return ret;
}
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;
err:
EVP_PKEY_CTX_free(ktri->pctx);
ktri->pctx = NULL;
- if (!ret
&& ek
)
+ if (!ret)
OPENSSL_free(ek);
return ret;
OPENSSL_free(ek);
return ret;
@@
-712,7
+711,7
@@
static int cms_RecipientInfo_kekri_encrypt(CMS_ContentInfo *cms,
err:
err:
- if (!r
&& wkey
)
+ if (!r)
OPENSSL_free(wkey);
OPENSSL_cleanse(&actx, sizeof(actx));
OPENSSL_free(wkey);
OPENSSL_cleanse(&actx, sizeof(actx));
@@
-785,7
+784,7
@@
static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
err:
err:
- if (!r
&& ukey
)
+ if (!r)
OPENSSL_free(ukey);
OPENSSL_cleanse(&actx, sizeof(actx));
OPENSSL_free(ukey);
OPENSSL_cleanse(&actx, sizeof(actx));