aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2017-04-18 16:08:46 +0300
committerSergey Kandaurov <pluknet@nginx.com>2017-04-18 16:08:46 +0300
commite8c579a18716395911201d3d5114c03ee018afc9 (patch)
tree8b05a513b469cd5a71db87e5656b9d3dc9726b1b /src
parent36be79301e513a97ec170950b6c9216100b2c264 (diff)
downloadnginx-e8c579a18716395911201d3d5114c03ee018afc9.tar.gz
nginx-e8c579a18716395911201d3d5114c03ee018afc9.zip
SSL: compatibility with OpenSSL master branch.
The SSL_CTRL_SET_CURVES_LIST macro is removed in the OpenSSL master branch. SSL_CTX_set1_curves_list is preserved as compatibility with previous versions.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 148705ccc..fdbd0c95d 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1090,7 +1090,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
* maximum interoperability.
*/
-#ifdef SSL_CTRL_SET_CURVES_LIST
+#if (defined SSL_CTX_set1_curves_list || defined SSL_CTRL_SET_CURVES_LIST)
/*
* OpenSSL 1.0.2+ allows configuring a curve list instead of a single