From c7d1d02db43b809b96238f8b557cfc2b8caa4b8a Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 7 Feb 2018 04:57:06 +0000
Subject: Remove guards around *_free() calls since these functions handle
 NULL.

---
 src/usr.bin/openssl/dhparam.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/usr.bin/openssl/dhparam.c')

diff --git a/src/usr.bin/openssl/dhparam.c b/src/usr.bin/openssl/dhparam.c
index 7c3bfb44c8..13e8a49a1c 100644
--- a/src/usr.bin/openssl/dhparam.c
+++ b/src/usr.bin/openssl/dhparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhparam.c,v 1.9 2017/01/20 08:57:11 deraadt Exp $ */
+/* $OpenBSD: dhparam.c,v 1.10 2018/02/07 04:57:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -292,8 +292,7 @@ dhparam_main(int argc, char **argv)
 			BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n", num);
 			if (!dsa || !DSA_generate_parameters_ex(dsa, num,
 				NULL, 0, NULL, NULL, &cb)) {
-				if (dsa)
-					DSA_free(dsa);
+				DSA_free(dsa);
 				ERR_print_errors(bio_err);
 				goto end;
 			}
@@ -469,10 +468,8 @@ dhparam_main(int argc, char **argv)
 
 end:
 	BIO_free(in);
-	if (out != NULL)
-		BIO_free_all(out);
-	if (dh != NULL)
-		DH_free(dh);
+	BIO_free_all(out);
+	DH_free(dh);
 
 	return (ret);
 }
-- 
cgit v1.2.3-55-g6feb