diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-28 10:54:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-28 10:54:15 -0400 |
| commit | c5ba2d990420e1778ca4a90bf882e0f806404af0 (patch) | |
| tree | 61641d19bea624b7fa523162f0ebb0d5e2fccf55 /demos | |
| parent | 33b188a8e82df57208ec8263c263f8b6f47e8255 (diff) | |
| download | openssl-new-c5ba2d990420e1778ca4a90bf882e0f806404af0.tar.gz | |
free NULL cleanup
EVP_.*free; this gets:
EVP_CIPHER_CTX_free EVP_PKEY_CTX_free EVP_PKEY_asn1_free
EVP_PKEY_asn1_set_free EVP_PKEY_free EVP_PKEY_free_it
EVP_PKEY_meth_free; and also EVP_CIPHER_CTX_cleanup
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/cms/cms_ddec.c | 3 | ||||
| -rw-r--r-- | demos/cms/cms_dec.c | 3 | ||||
| -rw-r--r-- | demos/cms/cms_sign.c | 3 | ||||
| -rw-r--r-- | demos/cms/cms_sign2.c | 6 | ||||
| -rw-r--r-- | demos/smime/smdec.c | 3 | ||||
| -rw-r--r-- | demos/smime/smsign.c | 3 | ||||
| -rw-r--r-- | demos/smime/smsign2.c | 6 |
7 files changed, 9 insertions, 18 deletions
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c index 7247e57112..1e06cea5c7 100644 --- a/demos/cms/cms_ddec.c +++ b/demos/cms/cms_ddec.c @@ -72,8 +72,7 @@ int main(int argc, char **argv) CMS_ContentInfo_free(cms); if (rcert) X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); + EVP_PKEY_free(rkey); BIO_free(in); BIO_free(out); diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c index e9782d7c23..71a0e4ffdd 100644 --- a/demos/cms/cms_dec.c +++ b/demos/cms/cms_dec.c @@ -63,8 +63,7 @@ int main(int argc, char **argv) CMS_ContentInfo_free(cms); if (rcert) X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); + EVP_PKEY_free(rkey); BIO_free(in); BIO_free(out); diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c index 9f2cff0dbe..3ad5ce8c18 100644 --- a/demos/cms/cms_sign.c +++ b/demos/cms/cms_sign.c @@ -73,8 +73,7 @@ int main(int argc, char **argv) CMS_ContentInfo_free(cms); if (scert) X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + EVP_PKEY_free(skey); BIO_free(in); BIO_free(out); diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c index 23c6eb8f9f..3276de1b2a 100644 --- a/demos/cms/cms_sign2.c +++ b/demos/cms/cms_sign2.c @@ -82,13 +82,11 @@ int main(int argc, char **argv) if (scert) X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + EVP_PKEY_free(skey); if (scert2) X509_free(scert2); - if (skey) - EVP_PKEY_free(skey2); + EVP_PKEY_free(skey2); BIO_free(in); BIO_free(out); diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c index b50f8dffaf..a418707b6b 100644 --- a/demos/smime/smdec.c +++ b/demos/smime/smdec.c @@ -63,8 +63,7 @@ int main(int argc, char **argv) PKCS7_free(p7); if (rcert) X509_free(rcert); - if (rkey) - EVP_PKEY_free(rkey); + EVP_PKEY_free(rkey); BIO_free(in); BIO_free(out); diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c index 6b9dfdd771..455efcb483 100644 --- a/demos/smime/smsign.c +++ b/demos/smime/smsign.c @@ -73,8 +73,7 @@ int main(int argc, char **argv) PKCS7_free(p7); if (scert) X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + EVP_PKEY_free(skey); BIO_free(in); BIO_free(out); diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c index 5d9de35c46..5f20a40349 100644 --- a/demos/smime/smsign2.c +++ b/demos/smime/smsign2.c @@ -82,13 +82,11 @@ int main(int argc, char **argv) if (scert) X509_free(scert); - if (skey) - EVP_PKEY_free(skey); + EVP_PKEY_free(skey); if (scert2) X509_free(scert2); - if (skey) - EVP_PKEY_free(skey2); + EVP_PKEY_free(skey2); BIO_free(in); BIO_free(out); |