diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-19 18:36:50 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-19 18:36:50 +0300 |
| commit | 9b8b33bd4a3f44a4d1a23b7fba09a014e0fcc5ab (patch) | |
| tree | bfe8162d3d610553b6506d6eb6786b904e571fab /src | |
| parent | 33f940534e89c599998ed9e516af565e6372e700 (diff) | |
| download | nginx-9b8b33bd4a3f44a4d1a23b7fba09a014e0fcc5ab.tar.gz nginx-9b8b33bd4a3f44a4d1a23b7fba09a014e0fcc5ab.zip | |
SSL: compatibility with BoringSSL.
BoringSSL changed SSL_set_tlsext_host_name() to be a real function
with a (const char *) argument, so it now triggers a warning due to
conversion from (u_char *). Added an explicit cast to silence the
warning.
Prodded by Piotr Sikora, Alessandro Ghedini.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 5 | ||||
| -rw-r--r-- | src/stream/ngx_stream_proxy_module.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 4d5bea35e..55a62ef8b 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1696,7 +1696,10 @@ ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upstream SSL server name: \"%s\"", name.data); - if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) { + if (SSL_set_tlsext_host_name(c->ssl->connection, + (char *) name.data) + == 0) + { ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0, "SSL_set_tlsext_host_name(\"%s\") failed", name.data); return NGX_ERROR; diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c index 4231f97f7..7772eb6c6 100644 --- a/src/stream/ngx_stream_proxy_module.c +++ b/src/stream/ngx_stream_proxy_module.c @@ -1183,7 +1183,8 @@ ngx_stream_proxy_ssl_name(ngx_stream_session_t *s) ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, "upstream SSL server name: \"%s\"", name.data); - if (SSL_set_tlsext_host_name(u->peer.connection->ssl->connection, name.data) + if (SSL_set_tlsext_host_name(u->peer.connection->ssl->connection, + (char *) name.data) == 0) { ngx_ssl_error(NGX_LOG_ERR, s->connection->log, 0, |