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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 15 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 16 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 6 |
4 files changed, 13 insertions, 27 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index bab95f3200..6da125897d 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1388,10 +1388,8 @@ int ssl3_get_key_exchange(SSL *s) s->session->sess_cert->peer_dh_tmp = NULL; #endif #ifndef OPENSSL_NO_EC - if (s->session->sess_cert->peer_ecdh_tmp) { - EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp); - s->session->sess_cert->peer_ecdh_tmp = NULL; - } + EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp); + s->session->sess_cert->peer_ecdh_tmp = NULL; #endif } else { s->session->sess_cert = ssl_sess_cert_new(); @@ -1959,8 +1957,7 @@ int ssl3_get_key_exchange(SSL *s) #ifndef OPENSSL_NO_EC BN_CTX_free(bn_ctx); EC_POINT_free(srvr_ecpoint); - if (ecdh != NULL) - EC_KEY_free(ecdh); + EC_KEY_free(ecdh); #endif EVP_MD_CTX_cleanup(&md_ctx); return (-1); @@ -2760,8 +2757,7 @@ int ssl3_send_client_key_exchange(SSL *s) BN_CTX_free(bn_ctx); if (encodedPoint != NULL) OPENSSL_free(encodedPoint); - if (clnt_ecdh != NULL) - EC_KEY_free(clnt_ecdh); + EC_KEY_free(clnt_ecdh); EVP_PKEY_free(srvr_pub_pkey); } #endif /* !OPENSSL_NO_EC */ @@ -3069,8 +3065,7 @@ int ssl3_send_client_key_exchange(SSL *s) BN_CTX_free(bn_ctx); if (encodedPoint != NULL) OPENSSL_free(encodedPoint); - if (clnt_ecdh != NULL) - EC_KEY_free(clnt_ecdh); + EC_KEY_free(clnt_ecdh); EVP_PKEY_free(srvr_pub_pkey); #endif return (-1); diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index bed4a4e72d..69f3d5d6f7 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3141,8 +3141,7 @@ void ssl3_free(SSL *s) DH_free(s->s3->tmp.dh); #endif #ifndef OPENSSL_NO_EC - if (s->s3->tmp.ecdh != NULL) - EC_KEY_free(s->s3->tmp.ecdh); + EC_KEY_free(s->s3->tmp.ecdh); #endif if (s->s3->tmp.ca_names != NULL) @@ -3182,10 +3181,8 @@ void ssl3_clear(SSL *s) s->s3->tmp.dh = NULL; #endif #ifndef OPENSSL_NO_EC - if (s->s3->tmp.ecdh != NULL) { - EC_KEY_free(s->s3->tmp.ecdh); - s->s3->tmp.ecdh = NULL; - } + EC_KEY_free(s->s3->tmp.ecdh); + s->s3->tmp.ecdh = NULL; #endif #ifndef OPENSSL_NO_TLSEXT # ifndef OPENSSL_NO_EC @@ -3356,8 +3353,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) return (ret); } } - if (s->cert->ecdh_tmp != NULL) - EC_KEY_free(s->cert->ecdh_tmp); + EC_KEY_free(s->cert->ecdh_tmp); s->cert->ecdh_tmp = ecdh; ret = 1; } @@ -3829,9 +3825,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) } } - if (cert->ecdh_tmp != NULL) { - EC_KEY_free(cert->ecdh_tmp); - } + EC_KEY_free(cert->ecdh_tmp); cert->ecdh_tmp = ecdh; return 1; } diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 05dc439c2d..68a8c812e0 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -2886,8 +2886,7 @@ int ssl3_get_client_key_exchange(SSL *s) #ifndef OPENSSL_NO_EC EVP_PKEY_free(clnt_pub_pkey); EC_POINT_free(clnt_ecpoint); - if (srvr_ecdh != NULL) - EC_KEY_free(srvr_ecdh); + EC_KEY_free(srvr_ecdh); BN_CTX_free(bn_ctx); #endif return (-1); diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 367f7a9603..f05a60a30a 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -449,8 +449,7 @@ void ssl_cert_free(CERT *c) DH_free(c->dh_tmp); #endif #ifndef OPENSSL_NO_EC - if (c->ecdh_tmp) - EC_KEY_free(c->ecdh_tmp); + EC_KEY_free(c->ecdh_tmp); #endif ssl_cert_clear_certs(c); @@ -655,8 +654,7 @@ void ssl_sess_cert_free(SESS_CERT *sc) DH_free(sc->peer_dh_tmp); #endif #ifndef OPENSSL_NO_EC - if (sc->peer_ecdh_tmp != NULL) - EC_KEY_free(sc->peer_ecdh_tmp); + EC_KEY_free(sc->peer_ecdh_tmp); #endif OPENSSL_free(sc); |