From a32b35170819e9b07e0183d19aee21b9a246943b Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 14 Apr 2018 07:09:21 +0000
Subject: make ENGINE_finish() succeed on NULL and simplify callers as in
 OpenSSL commit 7c96dbcdab9 by Rich Salz.

This cleans up the caller side quite a bit and reduces the number of
lines enclosed in #ifndef OPENSSL_NO_ENGINE.  codesearch.debian.net
shows that almost nothing checks the return value of ENGINE_finish().
While there, replace a few nearby 'if (!ptr)' with 'if (ptr == NULL)'.

ok jsing, tested by & ok inoguchi
---
 src/lib/libcrypto/ecdh/ech_lib.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/lib/libcrypto/ecdh/ech_lib.c')

diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
index 2846a88612..cc8edafa07 100644
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ b/src/lib/libcrypto/ecdh/ech_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_lib.c,v 1.13 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ech_lib.c,v 1.14 2018/04/14 07:09:21 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -109,10 +109,8 @@ ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
 		return 0;
 
 #ifndef OPENSSL_NO_ENGINE
-	if (ecdh->engine) {
-		ENGINE_finish(ecdh->engine);
-		ecdh->engine = NULL;
-	}
+	ENGINE_finish(ecdh->engine);
+	ecdh->engine = NULL;
 #endif
 	ecdh->meth = meth;
 	return 1;
@@ -138,7 +136,7 @@ ECDH_DATA_new_method(ENGINE *engine)
 		ret->engine = ENGINE_get_default_ECDH();
 	if (ret->engine) {
 		ret->meth = ENGINE_get_ECDH(ret->engine);
-		if (!ret->meth) {
+		if (ret->meth == NULL) {
 			ECDHerror(ERR_R_ENGINE_LIB);
 			ENGINE_finish(ret->engine);
 			free(ret);
@@ -176,8 +174,7 @@ ecdh_data_free(void *data)
 	ECDH_DATA *r = (ECDH_DATA *)data;
 
 #ifndef OPENSSL_NO_ENGINE
-	if (r->engine)
-		ENGINE_finish(r->engine);
+	ENGINE_finish(r->engine);
 #endif
 
 	CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, r, &r->ex_data);
-- 
cgit v1.2.3-55-g6feb