From 1e9445503c3ea65f8c138ab5dc555db0f1db91a7 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 14 Apr 2018 07:18:37 +0000
Subject: Make ENGINE_free() succeed on NULL. Matches OpenSSL's behavior and
 simplifies the caller side.

tested by & ok inoguchi; discussed with schwarze
---
 src/lib/libcrypto/ts/ts_conf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/ts/ts_conf.c')

diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index c223aa3d46..41d185ee5a 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_conf.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ts_conf.c,v 1.11 2018/04/14 07:18:37 tb Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -248,8 +248,7 @@ err:
 		TSerror(TS_R_COULD_NOT_SET_ENGINE);
 		ERR_asprintf_error_data("engine:%s", name);
 	}
-	if (e)
-		ENGINE_free(e);
+	ENGINE_free(e);
 	return ret;
 }
 
-- 
cgit v1.2.3-55-g6feb