QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-10 00:19:40 +00:00
Code Issues Projects Releases Wiki Activity

t1_trce: Fix remaining places where the 24 bit shift overflow happens

Browse Source 
[extended tests]

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11857)
This commit is contained in:
Tomas Mraz 2020-05-19 10:52:53 +02:00
parent 1d05eb55ca
commit 7486c718e5
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ssl/t1_trce.c
View File

@ -670,7 +670,10 @@ static int ssl_print_random(BIO *bio, int indent,
if (*pmsglen < 32) if (*pmsglen < 32)
return 0; return 0;
tm = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; tm = ((unsigned int)p[0] << 24)
| ((unsigned int)p[1] << 16)
| ((unsigned int)p[2] << 8)
| (unsigned int)p[3];
p += 4; p += 4;
BIO_indent(bio, indent, 80); BIO_indent(bio, indent, 80);
BIO_puts(bio, "Random:\n"); BIO_puts(bio, "Random:\n");
@ -875,8 +878,10 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
break; break;
if (extlen != 4) if (extlen != 4)
return 0; return 0;
max_early_data = (ext[0] << 24) | (ext[1] << 16) | (ext[2] << 8) max_early_data = ((unsigned int)ext[0] << 24)
| ext[3]; | ((unsigned int)ext[1] << 16)
| ((unsigned int)ext[2] << 8)
| (unsigned int)ext[3];
BIO_indent(bio, indent + 2, 80); BIO_indent(bio, indent + 2, 80);
BIO_printf(bio, "max_early_data=%u\n", max_early_data); BIO_printf(bio, "max_early_data=%u\n", max_early_data);
break; break;
@ -1379,7 +1384,10 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL *ssl,
} }
if (msglen < 4) if (msglen < 4)
return 0; return 0;
tick_life = (msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3]; tick_life = ((unsigned int)msg[0] << 24)
| ((unsigned int)msg[1] << 16)
| ((unsigned int)msg[2] << 8)
| (unsigned int)msg[3];
msglen -= 4; msglen -= 4;
msg += 4; msg += 4;
BIO_indent(bio, indent + 2, 80); BIO_indent(bio, indent + 2, 80);
@ -1390,7 +1398,10 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL *ssl,
if (msglen < 4) if (msglen < 4)
return 0; return 0;
ticket_age_add = ticket_age_add =
(msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3]; ((unsigned int)msg[0] << 24)
| ((unsigned int)msg[1] << 16)
| ((unsigned int)msg[2] << 8)
| (unsigned int)msg[3];
msglen -= 4; msglen -= 4;
msg += 4; msg += 4;
BIO_indent(bio, indent + 2, 80); BIO_indent(bio, indent + 2, 80);