diff options
author | jkim <jkim@FreeBSD.org> | 2014-04-08 20:15:18 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2014-04-08 20:15:18 +0000 |
commit | c16e01227ffa34203d2f43372183c566db7fad83 (patch) | |
tree | 287eb1e7dc05df721bd9cce14889bd9c693295e3 /ssl/s3_srvr.c | |
parent | a268cbece5d2525d61465ee0e4a2fcaf0134281f (diff) | |
download | FreeBSD-src-c16e01227ffa34203d2f43372183c566db7fad83.zip FreeBSD-src-c16e01227ffa34203d2f43372183c566db7fad83.tar.gz |
Import OpenSSL 1.0.1g.
Approved by: benl (maintainer)
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 52efed3..9ac19c0 100644 --- 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)) |