Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_ssl_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | 8246d8a2c2be |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
7 #include <ngx_config.h> | 7 #include <ngx_config.h> |
8 #include <ngx_core.h> | 8 #include <ngx_core.h> |
9 #include <ngx_mail.h> | 9 #include <ngx_mail.h> |
10 | 10 |
11 | 11 |
12 #define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP" | 12 #define NGX_DEFAULT_CIPHERS "HIGH:!ADH:!MD5" |
13 | 13 |
14 | 14 |
15 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); | 15 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); |
16 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child); | 16 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child); |
17 | 17 |
161 * | 161 * |
162 * scf->protocols = 0; | 162 * scf->protocols = 0; |
163 * scf->certificate = { 0, NULL }; | 163 * scf->certificate = { 0, NULL }; |
164 * scf->certificate_key = { 0, NULL }; | 164 * scf->certificate_key = { 0, NULL }; |
165 * scf->dhparam = { 0, NULL }; | 165 * scf->dhparam = { 0, NULL }; |
166 * scf->ciphers.len = 0; | 166 * scf->ciphers = { 0, NULL }; |
167 * scf->ciphers.data = NULL; | |
168 * scf->shm_zone = NULL; | 167 * scf->shm_zone = NULL; |
169 */ | 168 */ |
170 | 169 |
171 scf->enable = NGX_CONF_UNSET; | 170 scf->enable = NGX_CONF_UNSET; |
172 scf->starttls = NGX_CONF_UNSET_UINT; | 171 scf->starttls = NGX_CONF_UNSET_UINT; |
196 | 195 |
197 ngx_conf_merge_value(conf->prefer_server_ciphers, | 196 ngx_conf_merge_value(conf->prefer_server_ciphers, |
198 prev->prefer_server_ciphers, 0); | 197 prev->prefer_server_ciphers, 0); |
199 | 198 |
200 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | 199 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, |
201 (NGX_CONF_BITMASK_SET | 200 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); |
202 |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); | |
203 | 201 |
204 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); | 202 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |
205 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); | 203 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); |
206 | 204 |
207 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); | 205 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |