merge 0.9.7d

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index 0d7dae00b2..7ccf7022ee 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -107,14 +107,14 @@ static int int_def_cb(const char *alg, int len, void *arg)
         }
 
 
-int ENGINE_set_default_string(ENGINE *e, const char *list)
+int ENGINE_set_default_string(ENGINE *e, const char *def_list)
         {
         unsigned int flags = 0;
-        if (!CONF_parse_list(list, ',', 1, int_def_cb, &flags))
+        if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags))
                 {
                 ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_STRING,
                                         ENGINE_R_INVALID_STRING);
-                ERR_add_error_data(2, "str=",list);
+                ERR_add_error_data(2, "str=",def_list);
                 return 0;
                 }
         return ENGINE_set_default(e, flags);