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

Sanitize usage of <ctype.h> functions. It's important that characters

Browse Source 
are passed zero-extended, not sign-extended [from HEAD].
PR: 2682
This commit is contained in:
Andy Polyakov 2012-01-12 16:28:03 +00:00
parent b7b4a9fa57
commit 9b2a29660b
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ca.c
View File

@ -2560,7 +2560,7 @@ static int get_certificate_status(const char *serial, CA_DB *db)
/* Make it Upper Case */ /* Make it Upper Case */
for (i=0; row[DB_serial][i] != '\0'; i++) for (i=0; row[DB_serial][i] != '\0'; i++)
row[DB_serial][i] = toupper(row[DB_serial][i]); row[DB_serial][i] = toupper((unsigned char)row[DB_serial][i]);
ok=1; ok=1;

2
apps/s_client.c
View File

@ -763,7 +763,7 @@ int MAIN(int argc, char **argv)
psk_key=*(++argv); psk_key=*(++argv);
for (j = 0; j < strlen(psk_key); j++) for (j = 0; j < strlen(psk_key); j++)
{ {
if (isxdigit((int)psk_key[j])) if (isxdigit((unsigned char)psk_key[j]))
continue; continue;
BIO_printf(bio_err,"Not a hex number '%s'\n",*argv); BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
goto bad; goto bad;

2
apps/s_server.c
View File

@ -1204,7 +1204,7 @@ int MAIN(int argc, char *argv[])
psk_key=*(++argv); psk_key=*(++argv);
for (i=0; i<strlen(psk_key); i++) for (i=0; i<strlen(psk_key); i++)
{ {
if (isxdigit((int)psk_key[i])) if (isxdigit((unsigned char)psk_key[i]))
continue; continue;
BIO_printf(bio_err,"Not a hex number '%s'\n",*argv); BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
goto bad; goto bad;

6
crypto/asn1/asn_mime.c
View File

@ -801,7 +801,7 @@ static MIME_HEADER *mime_hdr_new(char *name, char *value)
if(name) { if(name) {
if(!(tmpname = BUF_strdup(name))) return NULL; if(!(tmpname = BUF_strdup(name))) return NULL;
for(p = tmpname ; *p; p++) { for(p = tmpname ; *p; p++) {
c = *p; c = (unsigned char)*p;
if(isupper(c)) { if(isupper(c)) {
c = tolower(c); c = tolower(c);
*p = c; *p = c;
@ -811,7 +811,7 @@ static MIME_HEADER *mime_hdr_new(char *name, char *value)
if(value) { if(value) {
if(!(tmpval = BUF_strdup(value))) return NULL; if(!(tmpval = BUF_strdup(value))) return NULL;
for(p = tmpval ; *p; p++) { for(p = tmpval ; *p; p++) {
c = *p; c = (unsigned char)*p;
if(isupper(c)) { if(isupper(c)) {
c = tolower(c); c = tolower(c);
*p = c; *p = c;
@ -835,7 +835,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value)
tmpname = BUF_strdup(name); tmpname = BUF_strdup(name);
if(!tmpname) return 0; if(!tmpname) return 0;
for(p = tmpname ; *p; p++) { for(p = tmpname ; *p; p++) {
c = *p; c = (unsigned char)*p;
if(isupper(c)) { if(isupper(c)) {
c = tolower(c); c = tolower(c);
*p = c; *p = c;

12
engines/ccgost/gost_pmeth.c
View File

@ -123,7 +123,7 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
} }
if (strlen(value) == 1) if (strlen(value) == 1)
{ {
switch(toupper(value[0])) switch(toupper((unsigned char)value[0]))
{ {
case 'A': case 'A':
param_nid = NID_id_GostR3410_94_CryptoPro_A_ParamSet; param_nid = NID_id_GostR3410_94_CryptoPro_A_ParamSet;
@ -142,9 +142,9 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
break; break;
} }
} }
else if ((strlen(value) == 2) && (toupper(value[0]) == 'X')) else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
{ {
switch (toupper(value[1])) switch (toupper((unsigned char)value[1]))
{ {
case 'A': case 'A':
param_nid = NID_id_GostR3410_94_CryptoPro_XchA_ParamSet; param_nid = NID_id_GostR3410_94_CryptoPro_XchA_ParamSet;
@ -198,7 +198,7 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
} }
if (strlen(value) == 1) if (strlen(value) == 1)
{ {
switch(toupper(value[0])) switch(toupper((unsigned char)value[0]))
{ {
case 'A': case 'A':
param_nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet; param_nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet;
@ -217,9 +217,9 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
break; break;
} }
} }
else if ((strlen(value) == 2) && (toupper(value[0]) == 'X')) else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
{ {
switch (toupper(value[1])) switch (toupper((unsigned char)value[1]))
{ {
case 'A': case 'A':
param_nid = NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet; param_nid = NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet;