import openssl-0.9.7d

2 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 57d2739ae0..2e9f52f1fd 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -235,7 +235,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
-        strcpy(section,"default");
+        BUF_strlcpy(section,"default",10);
 
         if (_CONF_new_data(conf) == 0)
                 {
@@ -392,7 +392,7 @@ again:
                                                         ERR_R_MALLOC_FAILURE);
                                 goto err;
                                 }
-                        strcpy(v->name,pname);
+                        BUF_strlcpy(v->name,pname,strlen(pname)+1);
                         if (!str_copy(conf,psection,&(v->value),start)) goto err;
 
                         if (strcmp(psection,section) != 0)
@@ -447,7 +447,7 @@ err:
         if (buff != NULL) BUF_MEM_free(buff);
         if (section != NULL) OPENSSL_free(section);
         if (line != NULL) *line=eline;
-        sprintf(btmp,"%ld",eline);
+        BIO_snprintf(btmp,sizeof btmp,"%ld",eline);
         ERR_add_error_data(2,"line ",btmp);
         if ((h != conf->data) && (conf->data != NULL))
                 {
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index edcc08921c..d45adea851 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/lib/libcrypto/conf/conf_mod.c
@@ -232,7 +232,7 @@ static int module_run(const CONF *cnf, char *name, char *value,
                         {
                         char rcode[DECIMAL_SIZE(ret)+1];
                         CONFerr(CONF_F_CONF_MODULES_LOAD, CONF_R_MODULE_INITIALIZATION_ERROR);
-                        sprintf(rcode, "%-8d", ret);
+                        BIO_snprintf(rcode, sizeof rcode, "%-8d", ret);
                         ERR_add_error_data(6, "module=", name, ", value=", value, ", retcode=", rcode);
                         }
                 }
@@ -561,11 +561,11 @@ char *CONF_get1_default_config_file(void)
 
         if (!file)
                 return NULL;
-        strcpy(file,X509_get_default_cert_area());
+        BUF_strlcpy(file,X509_get_default_cert_area(),len + 1);
 #ifndef OPENSSL_SYS_VMS
-        strcat(file,"/");
+        BUF_strlcat(file,"/",len + 1);
 #endif
-        strcat(file,OPENSSL_CONF);
+        BUF_strlcat(file,OPENSSL_CONF,len + 1);
 
         return file;
         }
@@ -576,12 +576,12 @@ char *CONF_get1_default_config_file(void)
  * be used to parse comma separated lists for example.
  */
 
-int CONF_parse_list(const char *list, int sep, int nospc,
+int CONF_parse_list(const char *list_, int sep, int nospc,
         int (*list_cb)(const char *elem, int len, void *usr), void *arg)
         {
         int ret;
         const char *lstart, *tmpend, *p;
-        lstart = list;
+        lstart = list_;
 
         for(;;)
                 {