Check GOST parameters are not NULL (CVE-2012-0027)

[oweals/openssl.git] / engines / ccgost / gost_ctl.c

diff --git a/engines/ccgost/gost_ctl.c b/engines/ccgost/gost_ctl.c
index d94089b9cbaf9b07b4ade54705bcb85429c044d5..d3cd171818a89d27066936ce86cf39bd4935225c 100644 (file)
--- a/engines/ccgost/gost_ctl.c
+++ b/engines/ccgost/gost_ctl.c
@@ -8,6 +8,8 @@
  **********************************************************************/            
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/engine.h>
 #include <openssl/buffer.h>
 #include "gost_lcl.h"
@@ -34,6 +36,17 @@ const ENGINE_CMD_DEFN gost_cmds[]=
 {0,NULL,NULL,0}
        };
 
+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;
+                       }
+               
+}
 
 int gost_control_func(ENGINE *e,int cmd,long i, void *p, void (*f)(void))
        {
@@ -55,6 +68,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]);
                gost_params[param] = BUF_strdup(tmp);
                return gost_params[param];
                }       
@@ -68,7 +82,7 @@ int gost_set_default_param(int param, const char *value)
        tmp = getenv(gost_envnames[param]);
        /* if there is value in the environment, use it, else -passed string * */
        if (!tmp) tmp=value;
-       if (gost_params[param]) free(gost_params[param]);
+       if (gost_params[param]) OPENSSL_free(gost_params[param]);
        gost_params[param] = BUF_strdup(tmp);
 
        return 1;