The branch master has been updated
via 1a49ff5a4ff290b988cd898b41c8504749a468fc (commit)
from fd6a0f5e525d187d7f1cd030e56d8aba9cafcbbf (commit)
- Log -----------------------------------------------------------------
commit 1a49ff5a4ff290b988cd898b41c8504749a468fc
Author: Patrick Steuer <patrick.ste...@de.ibm.com>
Date: Mon Dec 18 22:47:01 2017 +0100
crypto/engine/eng_list.c: compare getenv rv to NULL instead of 0
Signed-off-by: Patrick Steuer <patrick.ste...@de.ibm.com>
Reviewed-by: Tim Hudson <t...@openssl.org>
Reviewed-by: Ben Kaduk <ka...@mit.edu>
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4958)
-----------------------------------------------------------------------
Summary of changes:
crypto/engine/eng_list.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index b335ac1..53e138d 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -317,7 +317,7 @@ ENGINE *ENGINE_by_id(const char *id)
* Prevent infinite recursion if we're looking for the dynamic engine.
*/
if (strcmp(id, "dynamic")) {
- if ((load_dir = getenv("OPENSSL_ENGINES")) == 0)
+ if ((load_dir = getenv("OPENSSL_ENGINES")) == NULL)
load_dir = ENGINESDIR;
iterator = ENGINE_by_id("dynamic");
if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
