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/ec/ecp_mont.c | 57 +++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 37 deletions(-)

(limited to 'src/lib/libcrypto/ec/ecp_mont.c')

diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index ffbce81d4c..af8014ed38 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_mont.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: ecp_mont.c,v 1.9 2014/07/12 16:03:37 miod Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -128,14 +128,10 @@ ec_GFp_mont_group_init(EC_GROUP * group)
 void 
 ec_GFp_mont_group_finish(EC_GROUP * group)
 {
-	if (group->field_data1 != NULL) {
-		BN_MONT_CTX_free(group->field_data1);
-		group->field_data1 = NULL;
-	}
-	if (group->field_data2 != NULL) {
-		BN_free(group->field_data2);
-		group->field_data2 = NULL;
-	}
+	BN_MONT_CTX_free(group->field_data1);
+	group->field_data1 = NULL;
+	BN_free(group->field_data2);
+	group->field_data2 = NULL;
 	ec_GFp_simple_group_finish(group);
 }
 
@@ -143,14 +139,10 @@ ec_GFp_mont_group_finish(EC_GROUP * group)
 void 
 ec_GFp_mont_group_clear_finish(EC_GROUP * group)
 {
-	if (group->field_data1 != NULL) {
-		BN_MONT_CTX_free(group->field_data1);
-		group->field_data1 = NULL;
-	}
-	if (group->field_data2 != NULL) {
-		BN_clear_free(group->field_data2);
-		group->field_data2 = NULL;
-	}
+	BN_MONT_CTX_free(group->field_data1);
+	group->field_data1 = NULL;
+	BN_clear_free(group->field_data2);
+	group->field_data2 = NULL;
 	ec_GFp_simple_group_clear_finish(group);
 }
 
@@ -158,14 +150,11 @@ ec_GFp_mont_group_clear_finish(EC_GROUP * group)
 int 
 ec_GFp_mont_group_copy(EC_GROUP * dest, const EC_GROUP * src)
 {
-	if (dest->field_data1 != NULL) {
-		BN_MONT_CTX_free(dest->field_data1);
-		dest->field_data1 = NULL;
-	}
-	if (dest->field_data2 != NULL) {
-		BN_clear_free(dest->field_data2);
-		dest->field_data2 = NULL;
-	}
+	BN_MONT_CTX_free(dest->field_data1);
+	dest->field_data1 = NULL;
+	BN_clear_free(dest->field_data2);
+	dest->field_data2 = NULL;
+
 	if (!ec_GFp_simple_group_copy(dest, src))
 		return 0;
 
@@ -201,14 +190,10 @@ ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
 	BIGNUM *one = NULL;
 	int ret = 0;
 
-	if (group->field_data1 != NULL) {
-		BN_MONT_CTX_free(group->field_data1);
-		group->field_data1 = NULL;
-	}
-	if (group->field_data2 != NULL) {
-		BN_free(group->field_data2);
-		group->field_data2 = NULL;
-	}
+	BN_MONT_CTX_free(group->field_data1);
+	group->field_data1 = NULL;
+	BN_free(group->field_data2);
+	group->field_data2 = NULL;
 	if (ctx == NULL) {
 		ctx = new_ctx = BN_CTX_new();
 		if (ctx == NULL)
@@ -241,10 +226,8 @@ ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
 		group->field_data2 = NULL;
 	}
 err:
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	if (mont != NULL)
-		BN_MONT_CTX_free(mont);
+	BN_CTX_free(new_ctx);
+	BN_MONT_CTX_free(mont);
 	return ret;
 }
 
-- 
cgit v1.2.3-55-g6feb