diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-11 16:32:54 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-11 16:32:54 -0400 |
| commit | e0e920b1a063f14f36418f8795c96f2c649400e1 (patch) | |
| tree | b1704b3c1e380e01ab8fce7806bbd8d1d6997fa2 /test | |
| parent | a38537721dfdd853c40b4b4d99b57950075b0178 (diff) | |
free NULL cleanup 9
Ongoing work to skip NULL check before calling free routine. This gets:
ecp_nistz256_pre_comp_free nistp224_pre_comp_free nistp256_pre_comp_free
nistp521_pre_comp_free PKCS7_free PKCS7_RECIP_INFO_free
PKCS7_SIGNER_INFO_free sk_PKCS7_pop_free PKCS8_PRIV_KEY_INFO_free
PKCS12_free PKCS12_SAFEBAG_free PKCS12_free sk_PKCS12_SAFEBAG_pop_free
SSL_CONF_CTX_free SSL_CTX_free SSL_SESSION_free SSL_free ssl_cert_free
ssl_sess_cert_free
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_extra_test.c | 5 | ||||
| -rw-r--r-- | test/ssltest.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 567ed0f5f9..5641d98fee 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -410,10 +410,7 @@ static int test_EVP_PKCS82PKEY(void) ret = 1; done: - if (p8inf != NULL) { - PKCS8_PRIV_KEY_INFO_free(p8inf); - } - + PKCS8_PRIV_KEY_INFO_free(p8inf); EVP_PKEY_free(pkey); return ret; diff --git a/test/ssltest.c b/test/ssltest.c index 6ad63427ad..25bec77031 100644 --- a/test/ssltest.c +++ b/test/ssltest.c @@ -1791,7 +1791,6 @@ int main(int argc, char *argv[]) end: SSL_CTX_free(s_ctx); SSL_CTX_free(c_ctx); - SSL_CONF_CTX_free(s_cctx); SSL_CONF_CTX_free(c_cctx); sk_OPENSSL_STRING_free(conf_args); |