diff options
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 ad8480daad..a5d80a10a8 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 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; diff --git a/engines/e_chil.c b/engines/e_chil.c index 69d49d7d3a..19d29d7e62 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 36f6f43104..262766c602 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; } |