[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5850cc75ea0c1581a9034390f1ca77cadc596238 (commit)
      from  8314146ac57059f6d4095ef23e30ccdeb4699938 (commit)


- Log -----------------------------------------------------------------
commit 5850cc75ea0c1581a9034390f1ca77cadc596238
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>

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

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 9e80eaf..54141f3 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)) {