diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:39:16 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:39:16 +0000 |
| commit | 7a03f30dd26452476a4e565faecb3258a4f66ec3 (patch) | |
| tree | f06928a5f3207068da4b2ff60ee5fbe6f8ff3155 /src/mail | |
| parent | 987f1e5fcc2949cff76608910514b0ed82400f8f (diff) | |
| download | nginx-7a03f30dd26452476a4e565faecb3258a4f66ec3.tar.gz nginx-7a03f30dd26452476a4e565faecb3258a4f66ec3.tar.bz2 | |
merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
SSL fixes:
*) $ssl_session_id
*) allow "make clean" for OpenSSL, the bug was introduced in r2874
*) disable SSLv2 and use only strong ciphers by default
*) decrease SSL handshake error level to info
Diffstat (limited to 'src/mail')
| -rw-r--r-- | src/mail/ngx_mail_ssl_module.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index 025df54d7..90f2b1b2b 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -9,7 +9,7 @@ #include <ngx_mail.h> -#define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP" +#define NGX_DEFAULT_CIPHERS "HIGH:!ADH:!MD5" static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); @@ -198,8 +198,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) prev->prefer_server_ciphers, 0); ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, - (NGX_CONF_BITMASK_SET - |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); + (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); |