From 08517f27856f37e3b192a728af3558a691ba07ce Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sat, 3 Sep 2016 12:00:24 +0000
Subject: Fix some very unnecessary convoultion. ok krw@

---
 src/lib/libcrypto/ec/ec_lib.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 2b5abbd4bb..3894a7b9f0 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.20 2015/10/13 15:25:18 jsing Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.21 2016/09/03 12:00:24 beck Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -235,22 +235,12 @@ EC_GROUP_dup(const EC_GROUP * a)
 	EC_GROUP *t = NULL;
 	int ok = 0;
 
-	if (a == NULL)
-		return NULL;
-
-	if ((t = EC_GROUP_new(a->meth)) == NULL)
-		return (NULL);
-	if (!EC_GROUP_copy(t, a))
-		goto err;
-
-	ok = 1;
-
-err:
-	if (!ok) {
+	if ((a != NULL) && ((t = EC_GROUP_new(a->meth)) != NULL) &&
+	    (!EC_GROUP_copy(t, a))) {
 		EC_GROUP_free(t);
-		return NULL;
-	} else
-		return t;
+		t = NULL;
+	}
+	return t;
 }
 
 
-- 
cgit v1.2.3-55-g6feb