From 3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde Mon Sep 17 00:00:00 2001
From: mmcc <>
Date: Fri, 11 Mar 2016 07:08:45 +0000
Subject: X509_free(3) is NULL-safe, so remove NULL checks before its calls.

ok doug@
---
 src/lib/libcrypto/x509/by_file.c  | 5 ++---
 src/lib/libcrypto/x509/x509_vfy.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 68920271fc..377b3b0a8b 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_file.c,v 1.19 2015/04/11 16:03:21 deraadt Exp $ */
+/* $OpenBSD: by_file.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -172,8 +172,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
 		goto err;
 	}
 err:
-	if (x != NULL)
-		X509_free(x);
+	X509_free(x);
 	BIO_free(in);
 	return (ret);
 }
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index c9950adb27..5c043aa7b1 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.c,v 1.48 2015/12/14 03:38:13 beck Exp $ */
+/* $OpenBSD: x509_vfy.c,v 1.49 2016/03/11 07:08:45 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,8 +388,7 @@ end:
 	}
 	if (sktmp != NULL)
 		sk_X509_free(sktmp);
-	if (chain_ss != NULL)
-		X509_free(chain_ss);
+	X509_free(chain_ss);
 	return ok;
 }
 
-- 
cgit v1.2.3-55-g6feb