4 files changed, 17 insertions, 30 deletions

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 91178a92b0..729c996a1b 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_ameth.c,v 1.11 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_ameth.c,v 1.12 2014/07/12 16:03:37 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -120,8 +120,7 @@ dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 err:
         if (public_key)
                 ASN1_INTEGER_free(public_key);
-        if (dh)
-                DH_free(dh);
+        DH_free(dh);
         return 0;
 }
 
@@ -409,14 +408,12 @@ dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 
         if ((a = BN_dup(from->pkey.dh->p)) == NULL)
                 return 0;
-        if (to->pkey.dh->p != NULL)
-                BN_free(to->pkey.dh->p);
+        BN_free(to->pkey.dh->p);
         to->pkey.dh->p = a;
 
         if ((a = BN_dup(from->pkey.dh->g)) == NULL)
                 return 0;
-        if (to->pkey.dh->g != NULL)
-                BN_free(to->pkey.dh->g);
+        BN_free(to->pkey.dh->g);
         to->pkey.dh->g = a;
 
         return 1;
diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index 01b9531a44..0f6c50b055 100644
--- a/src/lib/libcrypto/dh/dh_check.c
+++ b/src/lib/libcrypto/dh/dh_check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_check.c,v 1.13 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_check.c,v 1.14 2014/07/12 16:03:37 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -114,10 +114,8 @@ DH_check(const DH *dh, int *ret)
         }
         ok = 1;
 err:
-        if (ctx != NULL)
-                BN_CTX_free(ctx);
-        if (q != NULL)
-                BN_free(q);
+        BN_CTX_free(ctx);
+        BN_free(q);
         return ok;
 }
 
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 6d90816122..132ba5cfa4 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_key.c,v 1.20 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_key.c,v 1.21 2014/07/12 16:03:37 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -260,7 +260,6 @@ dh_init(DH *dh)
 static int
 dh_finish(DH *dh)
 {
-        if (dh->method_mont_p)
-                BN_MONT_CTX_free(dh->method_mont_p);
+        BN_MONT_CTX_free(dh->method_mont_p);
         return 1;
 }
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index 0a956e5416..c438f387c0 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_lib.c,v 1.19 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_lib.c,v 1.20 2014/07/12 16:03:37 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -194,21 +194,14 @@ DH_free(DH *r)
 
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data);
 
-        if (r->p != NULL)
-                BN_clear_free(r->p);
-        if (r->g != NULL)
-                BN_clear_free(r->g);
-        if (r->q != NULL)
-                BN_clear_free(r->q);
-        if (r->j != NULL)
-                BN_clear_free(r->j);
+        BN_clear_free(r->p);
+        BN_clear_free(r->g);
+        BN_clear_free(r->q);
+        BN_clear_free(r->j);
         free(r->seed);
-        if (r->counter != NULL)
-                BN_clear_free(r->counter);
-        if (r->pub_key != NULL)
-                BN_clear_free(r->pub_key);
-        if (r->priv_key != NULL)
-                BN_clear_free(r->priv_key);
+        BN_clear_free(r->counter);
+        BN_clear_free(r->pub_key);
+        BN_clear_free(r->priv_key);
         free(r);
 }