diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-24 10:17:37 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-24 23:17:16 -0400 |
| commit | d64070838ebba86f00fb3755df5d3e65106e1628 (patch) | |
| tree | def90b3063d9ebe0f53920604d02b9786216e327 /engines | |
| parent | 1300705a47b9c9498b15a384c6c5348adc342e2c (diff) | |
| download | openssl-d64070838ebba86f00fb3755df5d3e65106e1628.zip openssl-d64070838ebba86f00fb3755df5d3e65106e1628.tar.gz openssl-d64070838ebba86f00fb3755df5d3e65106e1628.tar.bz2 | |
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')
| -rw-r--r-- | engines/ccgost/gost_ameth.c | 4 | ||||
| -rw-r--r-- | engines/e_capi.c | 6 | ||||
| -rw-r--r-- | engines/e_chil.c | 3 | ||||
| -rw-r--r-- | engines/e_sureware.c | 6 |
4 files changed, 6 insertions, 13 deletions
diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c index ad8480d..a5d80a1 100644 --- a/engines/ccgost/gost_ameth.c +++ b/engines/ccgost/gost_ameth.c @@ -276,9 +276,7 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2) /* --------------------- free functions * ------------------------------*/ static void pkey_free_gost94(EVP_PKEY *key) { - if (key->pkey.dsa) { - DSA_free(key->pkey.dsa); - } + DSA_free(key->pkey.dsa); } static void pkey_free_gost01(EVP_PKEY *key) diff --git a/engines/e_capi.c b/engines/e_capi.c index f280397..2373d69 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; diff --git a/engines/e_chil.c b/engines/e_chil.c index 69d49d7..19d29d7 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -849,8 +849,7 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id, return res; err: # ifndef OPENSSL_NO_RSA - if (rtmp) - RSA_free(rtmp); + RSA_free(rtmp); # endif return NULL; } diff --git a/engines/e_sureware.c b/engines/e_sureware.c index 36f6f43..262766c 100644 --- a/engines/e_sureware.c +++ b/engines/e_sureware.c @@ -801,12 +801,10 @@ static EVP_PKEY *sureware_load_public(ENGINE *e, const char *key_id, return res; err: # ifndef OPENSSL_NO_RSA - if (rsatmp) - RSA_free(rsatmp); + RSA_free(rsatmp); # endif # ifndef OPENSSL_NO_DSA - if (dsatmp) - DSA_free(dsatmp); + DSA_free(dsatmp); # endif return NULL; } |