Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 6157:b2899e7d0ef8
Disabled SSLv3 by default (ticket #653).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 May 2015 17:58:20 +0300 |
parents | a84267233877 |
children | 2cd019520210 |
comparison
equal
deleted
inserted
replaced
6156:a88e309f839b | 6157:b2899e7d0ef8 |
---|---|
282 | 282 |
283 ngx_conf_merge_value(conf->prefer_server_ciphers, | 283 ngx_conf_merge_value(conf->prefer_server_ciphers, |
284 prev->prefer_server_ciphers, 0); | 284 prev->prefer_server_ciphers, 0); |
285 | 285 |
286 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | 286 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, |
287 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 | 287 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 |
288 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); | 288 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
289 | 289 |
290 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); | 290 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); |
291 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); | 291 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); |
292 | 292 |