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/bn/bn_blind.c | 17 ++++++-----------
 src/lib/libcrypto/bn/bn_lib.c   |  5 ++---
 src/lib/libcrypto/bn/bn_mod.c   |  5 ++---
 src/lib/libcrypto/bn/bn_prime.c |  5 ++---
 src/lib/libcrypto/bn/bn_print.c |  5 ++---
 5 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'src/lib/libcrypto/bn')

diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
index 5f559da067..c842f76c6f 100644
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ b/src/lib/libcrypto/bn/bn_blind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_blind.c,v 1.13 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: bn_blind.c,v 1.14 2014/07/12 16:03:36 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -181,14 +181,10 @@ BN_BLINDING_free(BN_BLINDING *r)
 	if (r == NULL)
 		return;
 
-	if (r->A  != NULL)
-		BN_clear_free(r->A );
-	if (r->Ai != NULL)
-		BN_clear_free(r->Ai);
-	if (r->e  != NULL)
-		BN_clear_free(r->e );
-	if (r->mod != NULL)
-		BN_clear_free(r->mod);
+	BN_clear_free(r->A);
+	BN_clear_free(r->Ai);
+	BN_clear_free(r->e);
+	BN_clear_free(r->mod);
 	free(r);
 }
 
@@ -341,8 +337,7 @@ BN_BLINDING_create_param(BN_BLINDING *b, const BIGNUM *e, BIGNUM *m,
 		goto err;
 
 	if (e != NULL) {
-		if (ret->e != NULL)
-			BN_free(ret->e);
+		BN_free(ret->e);
 		ret->e = BN_dup(e);
 	}
 	if (ret->e == NULL)
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c
index 4ee9b2bbde..d0cb49cd1e 100644
--- a/src/lib/libcrypto/bn/bn_lib.c
+++ b/src/lib/libcrypto/bn/bn_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_lib.c,v 1.32 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_lib.c,v 1.33 2014/07/12 16:03:36 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -585,8 +585,7 @@ BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret)
 	i = ((n - 1) / BN_BYTES) + 1;
 	m = ((n - 1) % (BN_BYTES));
 	if (bn_wexpand(ret, (int)i) == NULL) {
-		if (bn)
-			BN_free(bn);
+		BN_free(bn);
 		return NULL;
 	}
 	ret->top = i;
diff --git a/src/lib/libcrypto/bn/bn_mod.c b/src/lib/libcrypto/bn/bn_mod.c
index a503ff3b1b..67bd3541b0 100644
--- a/src/lib/libcrypto/bn/bn_mod.c
+++ b/src/lib/libcrypto/bn/bn_mod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_mod.c,v 1.8 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_mod.c,v 1.9 2014/07/12 16:03:36 miod Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project. */
 /* ====================================================================
@@ -253,8 +253,7 @@ BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m, BN_CTX *ctx)
 	ret = BN_mod_lshift_quick(r, r, n, (abs_m ? abs_m : m));
 	bn_check_top(r);
 
-	if (abs_m)
-		BN_free(abs_m);
+	BN_free(abs_m);
 	return ret;
 }
 
diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c
index db786a63ef..27468ceb93 100644
--- a/src/lib/libcrypto/bn/bn_prime.c
+++ b/src/lib/libcrypto/bn/bn_prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_prime.c,v 1.10 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_prime.c,v 1.11 2014/07/12 16:03:36 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -344,8 +344,7 @@ err:
 		if (ctx_passed == NULL)
 			BN_CTX_free(ctx);
 	}
-	if (mont != NULL)
-		BN_MONT_CTX_free(mont);
+	BN_MONT_CTX_free(mont);
 
 	return (ret);
 }
diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
index ccdae5ae09..4920705a5b 100644
--- a/src/lib/libcrypto/bn/bn_print.c
+++ b/src/lib/libcrypto/bn/bn_print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_print.c,v 1.22 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_print.c,v 1.23 2014/07/12 16:03:36 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -163,8 +163,7 @@ BN_bn2dec(const BIGNUM *a)
 
 err:
 	free(bn_data);
-	if (t != NULL)
-		BN_free(t);
+	BN_free(t);
 	if (!ok && buf) {
 		free(buf);
 		buf = NULL;
-- 
cgit v1.2.3-55-g6feb