From 1ae7466a2fdd60df6484d8d132d70a044fd58c92 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sat, 12 Jul 2014 16:03:37 +0000
Subject: if (x) FOO_free(x) -> FOO_free(x). Improves readability, keeps the
 code smaller so that it is warmer in your cache.

review & ok deraadt@
---
 src/lib/libcrypto/ecdsa/ecs_ossl.c | 42 ++++++++++++++------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'src/lib/libcrypto/ecdsa/ecs_ossl.c')

diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index e2c4b1d6d1..0dde5386ff 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_ossl.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: ecs_ossl.c,v 1.5 2014/07/12 16:03:37 miod Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -189,28 +189,22 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 		goto err;	
 	}
 	/* clear old values if necessary */
-	if (*rp != NULL)
-		BN_clear_free(*rp);
-	if (*kinvp != NULL) 
-		BN_clear_free(*kinvp);
+	BN_clear_free(*rp);
+	BN_clear_free(*kinvp);
 	/* save the pre-computed values  */
 	*rp    = r;
 	*kinvp = k;
 	ret = 1;
 err:
-	if (!ret)
-	{
-		if (k != NULL) BN_clear_free(k);
-		if (r != NULL) BN_clear_free(r);
+	if (!ret) {
+		BN_clear_free(k);
+		BN_clear_free(r);
 	}
 	if (ctx_in == NULL) 
 		BN_CTX_free(ctx);
-	if (order != NULL)
-		BN_free(order);
-	if (tmp_point != NULL) 
-		EC_POINT_free(tmp_point);
-	if (X)
-		BN_clear_free(X);
+	BN_free(order);
+	EC_POINT_free(tmp_point);
+	BN_clear_free(X);
 	return(ret);
 }
 
@@ -333,16 +327,11 @@ err:
 		ECDSA_SIG_free(ret);
 		ret = NULL;
 	}
-	if (ctx)
-		BN_CTX_free(ctx);
-	if (m)
-		BN_clear_free(m);
-	if (tmp)
-		BN_clear_free(tmp);
-	if (order)
-		BN_free(order);
-	if (kinv)
-		BN_clear_free(kinv);
+	BN_CTX_free(ctx);
+	BN_clear_free(m);
+	BN_clear_free(tmp);
+	BN_free(order);
+	BN_clear_free(kinv);
 	return ret;
 }
 
@@ -473,7 +462,6 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
 err:
 	BN_CTX_end(ctx);
 	BN_CTX_free(ctx);
-	if (point)
-		EC_POINT_free(point);
+	EC_POINT_free(point);
 	return ret;
 }
-- 
cgit v1.2.3-55-g6feb