summaryrefslogtreecommitdiffstats
path: root/demos/smime
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-03-28 10:54:15 -0400
committerRich Salz <rsalz@openssl.org>2015-03-28 10:54:15 -0400
commitc5ba2d990420e1778ca4a90bf882e0f806404af0 (patch)
tree61641d19bea624b7fa523162f0ebb0d5e2fccf55 /demos/smime
parent33b188a8e82df57208ec8263c263f8b6f47e8255 (diff)
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/smime')
-rw-r--r--demos/smime/smdec.c3
-rw-r--r--demos/smime/smsign.c3
-rw-r--r--demos/smime/smsign2.c6
3 files changed, 4 insertions, 8 deletions
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);