[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Richard Levitte]

The branch OpenSSL_1_0_1-stable has been updated
       via  363c8fd572b19aa085dad8da6d7a5dd89930bf54 (commit)
      from  91dc4497dec6fcb1e0ecf61f257c9c13364328b4 (commit)


- Log -----------------------------------------------------------------
commit 363c8fd572b19aa085dad8da6d7a5dd89930bf54
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Oct 8 11:53:07 2015 +0200

    When ENGINE_add finds that id or name is missing, actually return
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 5850cc75ea0c1581a9034390f1ca77cadc596238)

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_list.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 3384e31..83c95d5 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)) {