From: Richard Levitte <levitte@openssl.org>
Date: Thu, 8 Oct 2015 09:53:07 +0000 (+0200)
Subject: When ENGINE_add finds that id or name is missing, actually return
X-Git-Tag: OpenSSL_1_0_1q~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=363c8fd572b19aa085dad8da6d7a5dd89930bf54;p=oweals%2Fopenssl.git

When ENGINE_add finds that id or name is missing, actually return

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 5850cc75ea0c1581a9034390f1ca77cadc596238)
---

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 3384e31828..83c95d56f4 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -260,6 +260,7 @@ int ENGINE_add(ENGINE *e)
     }
     if ((e->id == NULL) || (e->name == NULL)) {
         ENGINEerr(ENGINE_F_ENGINE_ADD, ENGINE_R_ID_OR_NAME_MISSING);
+        return 0;
     }
     CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
     if (!engine_list_add(e)) {