diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-03-27 23:34:31 +0900 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-03-27 20:17:18 -0400 |
| commit | d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80 (patch) | |
| tree | 7f4b716eff55fd05905240ebb0cc041688c93dfb /deps/openssl/openssl/ssl/s2_clnt.c | |
| parent | df62e69de73f4fb199f3b88727d13f6c52de332a (diff) | |
| download | android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.gz android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.bz2 android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.zip | |
deps: upgrade openssl sources to 1.0.2o
This replaces all sources of openssl-1.0.2o.tar.gz into
deps/openssl/openssl
PR-URL: https://github.com/nodejs/node/pull/19638
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/openssl/ssl/s2_clnt.c')
| -rw-r--r-- | deps/openssl/openssl/ssl/s2_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/openssl/openssl/ssl/s2_clnt.c b/deps/openssl/openssl/ssl/s2_clnt.c index 20de1a8217..3a8345ba2f 100644 --- a/deps/openssl/openssl/ssl/s2_clnt.c +++ b/deps/openssl/openssl/ssl/s2_clnt.c @@ -523,7 +523,7 @@ static int get_server_hello(SSL *s) } s->s2->conn_id_length = s->s2->tmp.conn_id_length; - if (s->s2->conn_id_length > sizeof s->s2->conn_id) { + if (s->s2->conn_id_length > sizeof(s->s2->conn_id)) { ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR); SSLerr(SSL_F_GET_SERVER_HELLO, SSL_R_SSL2_CONNECTION_ID_TOO_LONG); return -1; @@ -708,7 +708,7 @@ static int client_finished(SSL *s) if (s->state == SSL2_ST_SEND_CLIENT_FINISHED_A) { p = (unsigned char *)s->init_buf->data; *(p++) = SSL2_MT_CLIENT_FINISHED; - if (s->s2->conn_id_length > sizeof s->s2->conn_id) { + if (s->s2->conn_id_length > sizeof(s->s2->conn_id)) { SSLerr(SSL_F_CLIENT_FINISHED, ERR_R_INTERNAL_ERROR); return -1; } @@ -981,7 +981,7 @@ static int get_server_finished(SSL *s) } else { if (!(s->options & SSL_OP_MICROSOFT_SESS_ID_BUG)) { if ((s->session->session_id_length > - sizeof s->session->session_id) + sizeof(s->session->session_id)) || (0 != memcmp(buf + 1, s->session->session_id, (unsigned int)s->session->session_id_length))) { |