projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad03c71
)
Check i before r[i].
author
Dr. Stephen Henson
<steve@openssl.org>
Tue, 28 Jan 2014 15:10:27 +0000
(15:10 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 28 Jan 2014 15:10:27 +0000
(15:10 +0000)
PR#3244
ssl/s3_srvr.c
patch
|
blob
|
history
diff --git
a/ssl/s3_srvr.c
b/ssl/s3_srvr.c
index 52efed328a14ed4bdc2343d23dc9d2d3775160ae..9ac19c05f22d201a27b1e6fe63d8319d6dd81228 100644
(file)
--- a/
ssl/s3_srvr.c
+++ b/
ssl/s3_srvr.c
@@
-1830,7
+1830,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
@@
-1866,7
+1866,7
@@
int ssl3_send_server_key_exchange(SSL *s)
d=(unsigned char *)s->init_buf->data;
p= &(d[4]);
- 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))