1 files changed, 18 insertions, 14 deletions

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index 8397cfab6a..983604fb49 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -104,38 +104,41 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent)
         for(i=0;i<rows;i++)
                 {
                 buf[0]='\0';    /* start with empty string */
-                strcpy(buf,str);
-                sprintf(tmp,"%04x - ",i*dump_width);
-                strcat(buf,tmp);
+                strlcpy(buf,str,sizeof buf);
+                snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width);
+                strlcat(buf,tmp,sizeof buf);
                 for(j=0;j<dump_width;j++)
                         {
                         if (((i*dump_width)+j)>=len)
                                 {
-                                strcat(buf,"   ");
+                                strlcat(buf,"   ",sizeof buf);
                                 }
                         else
                                 {
                                 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
-                                sprintf(tmp,"%02x%c",ch,j==7?'-':' ');
-                                strcat(buf,tmp);
+                                snprintf(tmp,sizeof tmp,"%02x%c",ch,
+                                         j==7?'-':' ');
+                                strlcat(buf,tmp,sizeof buf);
                                 }
                         }
-                strcat(buf,"  ");
+                strlcat(buf,"  ",sizeof buf);
                 for(j=0;j<dump_width;j++)
                         {
                         if (((i*dump_width)+j)>=len)
                                 break;
                         ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
 #ifndef CHARSET_EBCDIC
-                        sprintf(tmp,"%c",((ch>=' ')&&(ch<='~'))?ch:'.');
+                        snprintf(tmp,sizeof tmp,"%c",
+                                 ((ch>=' ')&&(ch<='~'))?ch:'.');
 #else
-                        sprintf(tmp,"%c",((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
-                                ? os_toebcdic[ch]
-                                : '.');
+                        snprintf(tmp,sizeof tmp,"%c",
+                                 ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
+                                 ? os_toebcdic[ch]
+                                 : '.');
 #endif
-                        strcat(buf,tmp);
+                        strlcat(buf,tmp,sizeof buf);
                         }
-                strcat(buf,"\n");
+                strlcat(buf,"\n",sizeof buf);
                 /* if this is the last call then update the ddt_dump thing so that
                  * we will move the selection point in the debug window 
                  */
@@ -144,7 +147,8 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent)
 #ifdef TRUNCATE
         if (trunc > 0)
                 {
-                sprintf(buf,"%s%04x - <SPACES/NULS>\n",str,len+trunc);
+                snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
+                         len+trunc);
                 ret+=BIO_write(bio,(char *)buf,strlen(buf));
                 }
 #endif