summaryrefslogtreecommitdiffstats
path: root/engines/e_capi.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2015-03-24 15:17:37 +0100
committerRich Salz <rsalz@akamai.com>2015-03-25 04:17:16 +0100
commitd64070838ebba86f00fb3755df5d3e65106e1628 (patch)
treedef90b3063d9ebe0f53920604d02b9786216e327 /engines/e_capi.c
parentupdate ordinals (diff)
downloadopenssl-d64070838ebba86f00fb3755df5d3e65106e1628.tar.xz
openssl-d64070838ebba86f00fb3755df5d3e65106e1628.zip
free NULL cleanup
Start ensuring all OpenSSL "free" routines allow NULL, and remove any if check before calling them. This gets DH_free, DSA_free, RSA_free Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'engines/e_capi.c')
-rw-r--r--engines/e_capi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c
index f280397ad8..2373d69033 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -754,10 +754,8 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
if (pubkey)
OPENSSL_free(pubkey);
if (!ret) {
- if (rkey)
- RSA_free(rkey);
- if (dkey)
- DSA_free(dkey);
+ RSA_free(rkey);
+ DSA_free(dkey);
}
return ret;