projects
/
bcm963xx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and added files
[bcm963xx.git]
/
userapps
/
opensource
/
openssl
/
crypto
/
bio
/
b_dump.c
diff --git
a/userapps/opensource/openssl/crypto/bio/b_dump.c
b/userapps/opensource/openssl/crypto/bio/b_dump.c
index
8397cfa
..
f671e72
100755
(executable)
--- a/
userapps/opensource/openssl/crypto/bio/b_dump.c
+++ b/
userapps/opensource/openssl/crypto/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 */
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
);
+
BUF_strlcpy(buf,str,sizeof buf
);
+
BIO_snprintf(tmp,sizeof
tmp,"%04x - ",i*dump_width);
+
BUF_strlcat(buf,tmp,sizeof buf
);
for(j=0;j<dump_width;j++)
{
if (((i*dump_width)+j)>=len)
{
for(j=0;j<dump_width;j++)
{
if (((i*dump_width)+j)>=len)
{
-
strcat(buf," "
);
+
BUF_strlcat(buf," ",sizeof buf
);
}
else
{
ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
}
else
{
ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
- sprintf(tmp,"%02x%c",ch,j==7?'-':' ');
- strcat(buf,tmp);
+ BIO_snprintf(tmp,sizeof tmp,"%02x%c",ch,
+ j==7?'-':' ');
+ BUF_strlcat(buf,tmp,sizeof buf);
}
}
}
}
-
strcat(buf," "
);
+
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
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:'.');
+ BIO_snprintf(tmp,sizeof tmp,"%c",
+ ((ch>=' ')&&(ch<='~'))?ch:'.');
#else
#else
- sprintf(tmp,"%c",((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
- ? os_toebcdic[ch]
- : '.');
+ BIO_snprintf(tmp,sizeof tmp,"%c",
+ ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
+ ? os_toebcdic[ch]
+ : '.');
#endif
#endif
-
strcat(buf,tmp
);
+
BUF_strlcat(buf,tmp,sizeof buf
);
}
}
-
strcat(buf,"\n"
);
+
BUF_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
*/
/* 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)
{
#ifdef TRUNCATE
if (trunc > 0)
{
- sprintf(buf,"%s%04x - <SPACES/NULS>\n",str,len+trunc);
+ BIO_snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
+ len+trunc);
ret+=BIO_write(bio,(char *)buf,strlen(buf));
}
#endif
ret+=BIO_write(bio,(char *)buf,strlen(buf));
}
#endif