diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
| commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
| tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/ssl/s3_srvr.c | |
| parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/ssl/s3_srvr.c')
| -rw-r--r-- | openssl/ssl/s3_srvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/ssl/s3_srvr.c b/openssl/ssl/s3_srvr.c index 52efed328..9ac19c05f 100644 --- a/openssl/ssl/s3_srvr.c +++ b/openssl/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)) |