generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite OutputValue to avoid use of buffer when printing out hex values.

Browse Source 
Delete unused functions from fips_utl.h.

Increase xts line buffer.
This commit is contained in:
Dr. Stephen Henson 2011-04-22 00:41:35 +00:00
parent 79170bc97a
commit bef5013961
2 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fips/aes/fips_gcmtest.c
View File

@ -265,8 +265,8 @@ static void gcmtest(FILE *in, FILE *out, int encrypt)
static void xtstest(FILE *in, FILE *out) static void xtstest(FILE *in, FILE *out)
{ {
char buf[2048]; char buf[204800];
char lbuf[2048]; char lbuf[204800];
char *keyword, *value; char *keyword, *value;
int inlen; int inlen;
int encrypt = 0; int encrypt = 0;

51
fips/fips_utl.h
View File

@ -59,8 +59,6 @@ int do_bn_print(FILE *out, const BIGNUM *bn);
int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn); int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn);
int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf); int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf);
BIGNUM *hex2bn(const char *in); BIGNUM *hex2bn(const char *in);
int bin2hex(const unsigned char *in,int len,char *out);
void pv(const char *tag,const unsigned char *val,int len);
int tidy_line(char *linebuf, char *olinebuf); int tidy_line(char *linebuf, char *olinebuf);
int bint2bin(const char *in, int len, unsigned char *out); int bint2bin(const char *in, int len, unsigned char *out);
int bin2bint(const unsigned char *in,int len,char *out); int bin2bint(const unsigned char *in,int len,char *out);
@ -313,36 +311,6 @@ BIGNUM *hex2bn(const char *in)
return p; return p;
} }
int bin2hex(const unsigned char *in,int len,char *out)
{
int n1, n2;
unsigned char ch;
for (n1=0,n2=0 ; n1 < len ; ++n1)
{
ch=in[n1] >> 4;
if (ch <= 0x09)
out[n2++]=ch+'0';
else
out[n2++]=ch-10+'a';
ch=in[n1] & 0x0f;
if(ch <= 0x09)
out[n2++]=ch+'0';
else
out[n2++]=ch-10+'a';
}
out[n2]='\0';
return n2;
}
void pv(const char *tag,const unsigned char *val,int len)
{
char obuf[2048];
bin2hex(val,len,obuf);
printf("%s = %s\n",tag,obuf);
}
/* To avoid extensive changes to test program at this stage just convert /* To avoid extensive changes to test program at this stage just convert
* the input line into an acceptable form. Keyword lines converted to form * the input line into an acceptable form. Keyword lines converted to form
* "keyword = value\n" no matter what white space present, all other lines * "keyword = value\n" no matter what white space present, all other lines
@ -423,11 +391,8 @@ int bin2bint(const unsigned char *in,int len,char *out)
void PrintValue(char *tag, unsigned char *val, int len) void PrintValue(char *tag, unsigned char *val, int len)
{ {
#if VERBOSE #ifdef VERBOSE
char obuf[2048]; OutputValue(tag, val, len, stdout, 0);
int olen;
olen = bin2hex(val, len, obuf);
printf("%s = %.*s\n", tag, olen, obuf);
#endif #endif
} }
@ -437,11 +402,19 @@ void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode)
int olen; int olen;
if(bitmode) if(bitmode)
{
olen=bin2bint(val,len,obuf); olen=bin2bint(val,len,obuf);
fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
}
else else
olen=bin2hex(val,len,obuf); {
int i;
fprintf(rfp, "%s = ", tag);
for (i = 0; i < len; i++)
fprintf(rfp, "%02x", val[i]);
fputs("\n", rfp);
}
fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
#if VERBOSE #if VERBOSE
printf("%s = %.*s\n", tag, olen, obuf); printf("%s = %.*s\n", tag, olen, obuf);
#endif #endif