Merge branch 'no_gost94_sig' into gost12_algs

Conflicts:
	Makefile
	e_gost_err.c
	e_gost_err.h
	gost2001.c
	gost94_keyx.c
	gost_ameth.c
	gost_asn1.c
	gost_eng.c
	gost_lcl.h
	gost_params.c
	gost_params.h
	gost_pmeth.c
	gost_sign.c

1 files changed, 7 insertions, 9 deletions

diff --git a/gost_ctl.c b/gost_ctl.c
index caf3bd5..8e3c1c6 100644
--- a/gost_ctl.c
+++ b/gost_ctl.c
@@ -32,11 +32,11 @@ const ENGINE_CMD_DEFN gost_cmds[] = {
 void gost_param_free()
 {
     int i;
-    for (i = 0; i <= GOST_PARAM_MAX; i++)
-        if (gost_params[i] != NULL) {
-            OPENSSL_free(gost_params[i]);
-            gost_params[i] = NULL;
-        }
+
+    for (i = 0; i <= GOST_PARAM_MAX; i++) {
+        OPENSSL_free(gost_params[i]);
+        gost_params[i] = NULL;
+    }
 
 }
 
@@ -60,8 +60,7 @@ const char *get_gost_engine_param(int param)
     }
     tmp = getenv(gost_envnames[param]);
     if (tmp) {
-        if (gost_params[param])
-            OPENSSL_free(gost_params[param]);
+        OPENSSL_free(gost_params[param]);
         gost_params[param] = BUF_strdup(tmp);
         return gost_params[param];
     }
@@ -79,8 +78,7 @@ int gost_set_default_param(int param, const char *value)
      */
     if (!tmp)
         tmp = value;
-    if (gost_params[param])
-        OPENSSL_free(gost_params[param]);
+    OPENSSL_free(gost_params[param]);
     gost_params[param] = BUF_strdup(tmp);
 
     return 1;