Mercurial > hg > nginx
comparison src/event/ngx_event_openssl.c @ 7318:3443fe40bdc7
SSL: fixed SSL_clear_options() usage with OpenSSL 1.1.0+.
In OpenSSL 1.1.0 the SSL_CTRL_CLEAR_OPTIONS macro was removed, so
conditional compilation test on it results in SSL_clear_options()
and SSL_CTX_clear_options() not being used. Notably, this caused
"ssl_prefer_server_ciphers off" to not work in SNI-based virtual
servers if server preference was switched on in the default server.
It looks like the only possible fix is to test OPENSSL_VERSION_NUMBER
explicitly.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 16 Jul 2018 17:47:20 +0300 |
| parents | 6565f0dbe8c5 |
| children | dcab86115261 |
comparison
equal
deleted
inserted
replaced
| 7317:6565f0dbe8c5 | 7318:3443fe40bdc7 |
|---|---|
| 293 SSL_CTX_set_options(ssl->ctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); | 293 SSL_CTX_set_options(ssl->ctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); |
| 294 #endif | 294 #endif |
| 295 | 295 |
| 296 SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_DH_USE); | 296 SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_DH_USE); |
| 297 | 297 |
| 298 #ifdef SSL_CTRL_CLEAR_OPTIONS | 298 #if OPENSSL_VERSION_NUMBER >= 0x009080dfL |
| 299 /* only in 0.9.8m+ */ | 299 /* only in 0.9.8m+ */ |
| 300 SSL_CTX_clear_options(ssl->ctx, | 300 SSL_CTX_clear_options(ssl->ctx, |
| 301 SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1); | 301 SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1); |
| 302 #endif | 302 #endif |
| 303 | 303 |