8 files changed, 19 insertions, 29 deletions

diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c
index 466deaf6ce..05ac364fa7 100644
--- a/src/lib/libcrypto/asn1/x_info.c
+++ b/src/lib/libcrypto/asn1/x_info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_info.c,v 1.15 2015/02/10 11:22:21 jsing Exp $ */
+/* $OpenBSD: x_info.c,v 1.16 2016/03/11 07:08:44 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -97,8 +97,7 @@ X509_INFO_free(X509_INFO *x)
         if (i > 0)
                 return;
 
-        if (x->x509 != NULL)
-                X509_free(x->x509);
+        X509_free(x->x509);
         if (x->crl != NULL)
                 X509_CRL_free(x->crl);
         if (x->x_pkey != NULL)
diff --git a/src/lib/libcrypto/cms/cms_asn1.c b/src/lib/libcrypto/cms/cms_asn1.c
index e450259832..42e33d5b46 100644
--- a/src/lib/libcrypto/cms/cms_asn1.c
+++ b/src/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_asn1.c,v 1.7 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: cms_asn1.c,v 1.8 2016/03/11 07:08:44 mmcc Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -220,8 +220,7 @@ cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
         if (operation == ASN1_OP_FREE_POST) {
                 CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
                 EVP_PKEY_free(si->pkey);
-                if (si->signer)
-                        X509_free(si->signer);
+                X509_free(si->signer);
         }
         return 1;
 }
@@ -883,8 +882,7 @@ cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
                 if (ri->type == CMS_RECIPINFO_TRANS) {
                         CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
                         EVP_PKEY_free(ktri->pkey);
-                        if (ktri->recip)
-                                X509_free(ktri->recip);
+                        X509_free(ktri->recip);
                 } else if (ri->type == CMS_RECIPINFO_KEK) {
                         CMS_KEKRecipientInfo *kekri = ri->d.kekri;
                         if (kekri->key) {
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index f4119f7a1c..1623126e77 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_sd.c,v 1.9 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: cms_sd.c,v 1.10 2016/03/11 07:08:44 mmcc Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -498,8 +498,7 @@ CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer)
                 EVP_PKEY_free(si->pkey);
                 si->pkey = X509_get_pubkey(signer);
         }
-        if (si->signer)
-                X509_free(si->signer);
+        X509_free(si->signer);
         si->signer = signer;
 }
 
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index eaaa2bc911..df992a68fc 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_kiss.c,v 1.16 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_kiss.c,v 1.17 2016/03/11 07:08:44 mmcc Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -149,8 +149,7 @@ PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
                                 goto err;
                         x = NULL;
                 }
-                if (x)
-                        X509_free(x);
+                X509_free(x);
         }
 
         if (ocerts)
@@ -161,10 +160,9 @@ PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 err:
         if (pkey && *pkey)
                 EVP_PKEY_free(*pkey);
-        if (cert && *cert)
+        if (cert)
                 X509_free(*cert);
-        if (x)
-                X509_free(x);
+        X509_free(x);
         if (ocerts)
                 sk_X509_pop_free(ocerts, X509_free);
         return 0;
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 758d747384..f9e8c53cc8 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_sign.c,v 1.19 2015/09/30 18:04:02 jsing Exp $ */
+/* $OpenBSD: ts_rsp_sign.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -185,8 +185,7 @@ TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
                     TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE);
                 return 0;
         }
-        if (ctx->signer_cert)
-                X509_free(ctx->signer_cert);
+        X509_free(ctx->signer_cert);
         ctx->signer_cert = signer;
         CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509);
         return 1;
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 68920271fc..377b3b0a8b 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_file.c,v 1.19 2015/04/11 16:03:21 deraadt Exp $ */
+/* $OpenBSD: by_file.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -172,8 +172,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
                 goto err;
         }
 err:
-        if (x != NULL)
-                X509_free(x);
+        X509_free(x);
         BIO_free(in);
         return (ret);
 }
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index c9950adb27..5c043aa7b1 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.c,v 1.48 2015/12/14 03:38:13 beck Exp $ */
+/* $OpenBSD: x509_vfy.c,v 1.49 2016/03/11 07:08:45 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,8 +388,7 @@ end:
         }
         if (sktmp != NULL)
                 sk_X509_free(sktmp);
-        if (chain_ss != NULL)
-                X509_free(chain_ss);
+        X509_free(chain_ss);
         return ok;
 }
 
diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c
index af9bf00c66..7b28acbe1f 100644
--- a/src/lib/libcrypto/x509v3/pcy_tree.c
+++ b/src/lib/libcrypto/x509v3/pcy_tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcy_tree.c,v 1.15 2015/07/18 00:01:05 beck Exp $ */
+/* $OpenBSD: pcy_tree.c,v 1.16 2016/03/11 07:08:45 mmcc Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2004.
  */
@@ -639,8 +639,7 @@ X509_policy_tree_free(X509_POLICY_TREE *tree)
         sk_X509_POLICY_NODE_pop_free(tree->user_policies, exnode_free);
 
         for (i = 0, curr = tree->levels; i < tree->nlevel; i++, curr++) {
-                if (curr->cert)
-                        X509_free(curr->cert);
+                X509_free(curr->cert);
                 if (curr->nodes)
                         sk_X509_POLICY_NODE_pop_free(curr->nodes,
                     policy_node_free);