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

Check i before r[i].

Browse Source 
PR#3244
(cherry picked from commit 9614d2c676)
This commit is contained in:
Dr. Stephen Henson 2014-01-28 15:10:27 +00:00
parent 717cc85895
commit 73c92dfa0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s3_srvr.c
View File

@ -1896,7 +1896,7 @@ int ssl3_send_server_key_exchange(SSL *s)
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
goto f_err;
}
for (i=0; r[i] != NULL && i<4; i++)
for (i=0; i < 4 && r[i] != NULL; i++)
{
nr[i]=BN_num_bytes(r[i]);
#ifndef OPENSSL_NO_SRP
@ -1931,7 +1931,7 @@ int ssl3_send_server_key_exchange(SSL *s)
}
d = p = ssl_handshake_start(s);
for (i=0; r[i] != NULL && i<4; i++)
for (i=0; i < 4 && r[i] != NULL; i++)
{
#ifndef OPENSSL_NO_SRP
if ((i == 2) && (type & SSL_kSRP))