1 files changed, 6 insertions, 16 deletions

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;
 }