diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-25 18:35:24 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-25 18:35:24 -0400 |
| commit | 8fdc3734c063146b038608c2412a0f2c9b21b6d6 (patch) | |
| tree | ed30d40a40a6bf7002121a29e3db4b4790a54d87 /crypto/ec/ec_ameth.c | |
| parent | 17dd65e6e1f888b4561d559b4d44fbbe0a0aa3e7 (diff) | |
free NULL cleanup.
This gets EC_GROUP_clear_free EC_GROUP_free, EC_KEY_free,
EC_POINT_clear_free, EC_POINT_free
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/ec/ec_ameth.c')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index de56c89498..4be85a9e87 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -176,8 +176,7 @@ static EC_KEY *eckey_type2param(int ptype, void *pval) return eckey; ecerr: - if (eckey) - EC_KEY_free(eckey); + EC_KEY_free(eckey); return NULL; } @@ -210,8 +209,7 @@ static int eckey_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) return 1; ecerr: - if (eckey) - EC_KEY_free(eckey); + EC_KEY_free(eckey); return 0; } @@ -292,8 +290,7 @@ static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) ecliberr: ECerr(EC_F_ECKEY_PRIV_DECODE, ERR_R_EC_LIB); ecerr: - if (eckey) - EC_KEY_free(eckey); + EC_KEY_free(eckey); return 0; } @@ -706,8 +703,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx, if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0) rv = 1; err: - if (ecpeer) - EC_KEY_free(ecpeer); + EC_KEY_free(ecpeer); if (pkpeer) EVP_PKEY_free(pkpeer); return rv; |