diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-01-28 15:10:27 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-01-28 15:14:47 +0000 |
| commit | a99540a6de7145f1e6ccfd839631a07b4483772d (patch) | |
| tree | 1a82282f7f205de1bf37272fb8f39a85e1d43477 /ssl/s3_srvr.c | |
| parent | 9614ed695d77476f3c929d3ebe24f5e01985d7fa (diff) | |
Check i before r[i].
PR#3244
(cherry picked from commit 9614d2c676ffe74ce0c919d9e5c0d622a011cbed)
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 8e8daf2997..8902303afd 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1878,7 +1878,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 @@ -1913,7 +1913,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)) |