Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 5387:0fbcfab0bfd7
SSL: stop loading configs with invalid "ssl_ciphers" values.
While there, remove unnecessary check in ngx_mail_ssl_module.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
| author | Piotr Sikora <piotr@cloudflare.com> |
|---|---|
| date | Sun, 22 Sep 2013 22:36:11 -0700 |
| parents | c0f7b94e88ba |
| children | 1356a3b96924 |
comparison
equal
deleted
inserted
replaced
| 5386:2d947c2e3ea1 | 5387:0fbcfab0bfd7 |
|---|---|
| 559 == 0) | 559 == 0) |
| 560 { | 560 { |
| 561 ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, | 561 ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, |
| 562 "SSL_CTX_set_cipher_list(\"%V\") failed", | 562 "SSL_CTX_set_cipher_list(\"%V\") failed", |
| 563 &conf->ciphers); | 563 &conf->ciphers); |
| 564 return NGX_CONF_ERROR; | |
| 564 } | 565 } |
| 565 | 566 |
| 566 if (conf->verify) { | 567 if (conf->verify) { |
| 567 | 568 |
| 568 if (conf->client_certificate.len == 0 && conf->verify != 3) { | 569 if (conf->client_certificate.len == 0 && conf->verify != 3) { |