Mercurial > hg > nginx
annotate src/mail/ngx_mail_ssl_module.c @ 4400:a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Support for TLSv1.1 and TLSv1.2 protocols was introduced in OpenSSL 1.0.1
(-beta1 was recently released). This change makes it possible to disable
these protocols and/or enable them without other protocols.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 11 Jan 2012 11:15:00 +0000 |
| parents | 7de74ed694c8 |
| children | d620f497c50f |
| rev | line source |
|---|---|
| 539 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 1136 | 9 #include <ngx_mail.h> |
| 539 | 10 |
| 11 | |
| 3960 | 12 #define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5" |
| 13 #define NGX_DEFAULT_ECDH_CURVE "prime256v1" | |
| 539 | 14 |
| 15 | |
| 1136 | 16 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); |
| 17 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child); | |
| 2224 | 18 |
| 19 static char *ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 20 void *conf); | |
| 21 static char *ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 22 void *conf); | |
| 1136 | 23 static char *ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, |
| 976 | 24 void *conf); |
| 539 | 25 |
| 26 | |
| 583 | 27 static ngx_conf_enum_t ngx_http_starttls_state[] = { |
| 1136 | 28 { ngx_string("off"), NGX_MAIL_STARTTLS_OFF }, |
| 29 { ngx_string("on"), NGX_MAIL_STARTTLS_ON }, | |
| 30 { ngx_string("only"), NGX_MAIL_STARTTLS_ONLY }, | |
| 583 | 31 { ngx_null_string, 0 } |
| 32 }; | |
| 33 | |
| 34 | |
| 35 | |
| 1136 | 36 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = { |
| 547 | 37 { ngx_string("SSLv2"), NGX_SSL_SSLv2 }, |
| 38 { ngx_string("SSLv3"), NGX_SSL_SSLv3 }, | |
| 39 { ngx_string("TLSv1"), NGX_SSL_TLSv1 }, | |
|
4400
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
40 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 }, |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
41 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 }, |
| 547 | 42 { ngx_null_string, 0 } |
| 43 }; | |
| 44 | |
| 45 | |
| 1136 | 46 static ngx_command_t ngx_mail_ssl_commands[] = { |
| 539 | 47 |
| 48 { ngx_string("ssl"), | |
| 1136 | 49 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, |
| 2224 | 50 ngx_mail_ssl_enable, |
| 1136 | 51 NGX_MAIL_SRV_CONF_OFFSET, |
| 52 offsetof(ngx_mail_ssl_conf_t, enable), | |
| 539 | 53 NULL }, |
| 54 | |
| 583 | 55 { ngx_string("starttls"), |
| 1136 | 56 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 2224 | 57 ngx_mail_ssl_starttls, |
| 1136 | 58 NGX_MAIL_SRV_CONF_OFFSET, |
| 59 offsetof(ngx_mail_ssl_conf_t, starttls), | |
| 583 | 60 ngx_http_starttls_state }, |
| 61 | |
| 539 | 62 { ngx_string("ssl_certificate"), |
| 1136 | 63 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 539 | 64 ngx_conf_set_str_slot, |
| 1136 | 65 NGX_MAIL_SRV_CONF_OFFSET, |
| 66 offsetof(ngx_mail_ssl_conf_t, certificate), | |
| 539 | 67 NULL }, |
| 68 | |
| 69 { ngx_string("ssl_certificate_key"), | |
| 1136 | 70 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 539 | 71 ngx_conf_set_str_slot, |
| 1136 | 72 NGX_MAIL_SRV_CONF_OFFSET, |
| 73 offsetof(ngx_mail_ssl_conf_t, certificate_key), | |
| 539 | 74 NULL }, |
| 75 | |
| 2044 | 76 { ngx_string("ssl_dhparam"), |
| 77 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, | |
| 78 ngx_conf_set_str_slot, | |
| 79 NGX_MAIL_SRV_CONF_OFFSET, | |
| 80 offsetof(ngx_mail_ssl_conf_t, dhparam), | |
| 81 NULL }, | |
| 82 | |
| 3960 | 83 { ngx_string("ssl_ecdh_curve"), |
| 84 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, | |
| 85 ngx_conf_set_str_slot, | |
| 86 NGX_MAIL_SRV_CONF_OFFSET, | |
| 87 offsetof(ngx_mail_ssl_conf_t, ecdh_curve), | |
| 88 NULL }, | |
| 89 | |
| 547 | 90 { ngx_string("ssl_protocols"), |
| 1136 | 91 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, |
| 547 | 92 ngx_conf_set_bitmask_slot, |
| 1136 | 93 NGX_MAIL_SRV_CONF_OFFSET, |
| 94 offsetof(ngx_mail_ssl_conf_t, protocols), | |
| 95 &ngx_mail_ssl_protocols }, | |
| 547 | 96 |
| 539 | 97 { ngx_string("ssl_ciphers"), |
| 1136 | 98 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 539 | 99 ngx_conf_set_str_slot, |
| 1136 | 100 NGX_MAIL_SRV_CONF_OFFSET, |
| 101 offsetof(ngx_mail_ssl_conf_t, ciphers), | |
| 539 | 102 NULL }, |
| 103 | |
| 547 | 104 { ngx_string("ssl_prefer_server_ciphers"), |
| 1136 | 105 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, |
| 547 | 106 ngx_conf_set_flag_slot, |
| 1136 | 107 NGX_MAIL_SRV_CONF_OFFSET, |
| 108 offsetof(ngx_mail_ssl_conf_t, prefer_server_ciphers), | |
| 547 | 109 NULL }, |
| 563 | 110 |
| 976 | 111 { ngx_string("ssl_session_cache"), |
| 1136 | 112 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE12, |
| 113 ngx_mail_ssl_session_cache, | |
| 114 NGX_MAIL_SRV_CONF_OFFSET, | |
| 976 | 115 0, |
| 116 NULL }, | |
| 117 | |
| 573 | 118 { ngx_string("ssl_session_timeout"), |
| 1136 | 119 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 573 | 120 ngx_conf_set_sec_slot, |
| 1136 | 121 NGX_MAIL_SRV_CONF_OFFSET, |
| 122 offsetof(ngx_mail_ssl_conf_t, session_timeout), | |
| 573 | 123 NULL }, |
| 547 | 124 |
| 539 | 125 ngx_null_command |
| 126 }; | |
| 127 | |
| 128 | |
| 1136 | 129 static ngx_mail_module_t ngx_mail_ssl_module_ctx = { |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1136
diff
changeset
|
130 NULL, /* protocol */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1136
diff
changeset
|
131 |
| 539 | 132 NULL, /* create main configuration */ |
| 133 NULL, /* init main configuration */ | |
| 134 | |
| 1136 | 135 ngx_mail_ssl_create_conf, /* create server configuration */ |
| 136 ngx_mail_ssl_merge_conf /* merge server configuration */ | |
| 539 | 137 }; |
| 138 | |
| 139 | |
| 1136 | 140 ngx_module_t ngx_mail_ssl_module = { |
| 539 | 141 NGX_MODULE_V1, |
| 1136 | 142 &ngx_mail_ssl_module_ctx, /* module context */ |
| 143 ngx_mail_ssl_commands, /* module directives */ | |
| 144 NGX_MAIL_MODULE, /* module type */ | |
| 541 | 145 NULL, /* init master */ |
| 539 | 146 NULL, /* init module */ |
| 541 | 147 NULL, /* init process */ |
| 148 NULL, /* init thread */ | |
| 149 NULL, /* exit thread */ | |
| 150 NULL, /* exit process */ | |
| 151 NULL, /* exit master */ | |
| 152 NGX_MODULE_V1_PADDING | |
| 539 | 153 }; |
| 154 | |
| 155 | |
| 1136 | 156 static ngx_str_t ngx_mail_ssl_sess_id_ctx = ngx_string("MAIL"); |
| 543 | 157 |
| 158 | |
| 539 | 159 static void * |
| 1136 | 160 ngx_mail_ssl_create_conf(ngx_conf_t *cf) |
| 577 | 161 { |
| 1136 | 162 ngx_mail_ssl_conf_t *scf; |
| 577 | 163 |
| 1136 | 164 scf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_ssl_conf_t)); |
| 539 | 165 if (scf == NULL) { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2759
diff
changeset
|
166 return NULL; |
| 539 | 167 } |
| 168 | |
| 169 /* | |
| 577 | 170 * set by ngx_pcalloc(): |
| 539 | 171 * |
| 547 | 172 * scf->protocols = 0; |
| 2044 | 173 * scf->certificate = { 0, NULL }; |
| 174 * scf->certificate_key = { 0, NULL }; | |
| 175 * scf->dhparam = { 0, NULL }; | |
| 3960 | 176 * scf->ecdh_curve = { 0, NULL }; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3196
diff
changeset
|
177 * scf->ciphers = { 0, NULL }; |
| 976 | 178 * scf->shm_zone = NULL; |
| 539 | 179 */ |
| 180 | |
| 181 scf->enable = NGX_CONF_UNSET; | |
| 2759 | 182 scf->starttls = NGX_CONF_UNSET_UINT; |
| 976 | 183 scf->prefer_server_ciphers = NGX_CONF_UNSET; |
| 184 scf->builtin_session_cache = NGX_CONF_UNSET; | |
| 573 | 185 scf->session_timeout = NGX_CONF_UNSET; |
| 539 | 186 |
| 187 return scf; | |
| 188 } | |
| 189 | |
| 190 | |
| 191 static char * | |
| 1136 | 192 ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
| 539 | 193 { |
| 1136 | 194 ngx_mail_ssl_conf_t *prev = parent; |
| 195 ngx_mail_ssl_conf_t *conf = child; | |
| 539 | 196 |
| 2224 | 197 char *mode; |
| 563 | 198 ngx_pool_cleanup_t *cln; |
| 199 | |
| 539 | 200 ngx_conf_merge_value(conf->enable, prev->enable, 0); |
| 2224 | 201 ngx_conf_merge_uint_value(conf->starttls, prev->starttls, |
| 202 NGX_MAIL_STARTTLS_OFF); | |
| 539 | 203 |
| 573 | 204 ngx_conf_merge_value(conf->session_timeout, |
| 205 prev->session_timeout, 300); | |
| 206 | |
| 547 | 207 ngx_conf_merge_value(conf->prefer_server_ciphers, |
| 208 prev->prefer_server_ciphers, 0); | |
| 209 | |
| 210 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | |
|
4400
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
211 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
212 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
| 547 | 213 |
| 2224 | 214 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |
| 215 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); | |
| 539 | 216 |
| 2044 | 217 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |
| 218 | |
| 3960 | 219 ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve, |
| 220 NGX_DEFAULT_ECDH_CURVE); | |
| 221 | |
| 2124 | 222 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS); |
| 539 | 223 |
| 224 | |
| 547 | 225 conf->ssl.log = cf->log; |
| 539 | 226 |
| 2224 | 227 if (conf->enable) { |
| 228 mode = "ssl"; | |
| 229 | |
| 230 } else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) { | |
| 231 mode = "starttls"; | |
| 232 | |
| 233 } else { | |
| 234 mode = ""; | |
| 235 } | |
| 236 | |
| 237 if (*mode) { | |
| 238 | |
| 239 if (conf->certificate.len == 0) { | |
| 240 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 241 "no \"ssl_certificate\" is defined for " | |
| 242 "the \"%s\" directive in %s:%ui", | |
| 243 mode, conf->file, conf->line); | |
| 244 return NGX_CONF_ERROR; | |
| 245 } | |
| 246 | |
| 247 if (conf->certificate_key.len == 0) { | |
| 248 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 249 "no \"ssl_certificate_key\" is defined for " | |
| 250 "the \"%s\" directive in %s:%ui", | |
| 251 mode, conf->file, conf->line); | |
| 252 return NGX_CONF_ERROR; | |
| 253 } | |
| 254 | |
| 255 } else { | |
| 256 | |
| 257 if (conf->certificate.len == 0) { | |
| 258 return NGX_CONF_OK; | |
| 259 } | |
| 260 | |
| 261 if (conf->certificate_key.len == 0) { | |
| 262 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 263 "no \"ssl_certificate_key\" is defined " | |
| 264 "for certificate \"%V\"", | |
| 265 &conf->certificate); | |
| 266 return NGX_CONF_ERROR; | |
| 267 } | |
| 268 } | |
| 269 | |
| 969 | 270 if (ngx_ssl_create(&conf->ssl, conf->protocols, NULL) != NGX_OK) { |
| 539 | 271 return NGX_CONF_ERROR; |
| 272 } | |
| 273 | |
| 563 | 274 cln = ngx_pool_cleanup_add(cf->pool, 0); |
| 275 if (cln == NULL) { | |
| 539 | 276 return NGX_CONF_ERROR; |
| 277 } | |
| 278 | |
| 563 | 279 cln->handler = ngx_ssl_cleanup_ctx; |
| 280 cln->data = &conf->ssl; | |
| 281 | |
| 282 if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate, | |
| 283 &conf->certificate_key) | |
| 284 != NGX_OK) | |
| 547 | 285 { |
| 286 return NGX_CONF_ERROR; | |
| 287 } | |
| 539 | 288 |
| 289 if (conf->ciphers.len) { | |
| 547 | 290 if (SSL_CTX_set_cipher_list(conf->ssl.ctx, |
| 563 | 291 (const char *) conf->ciphers.data) |
| 292 == 0) | |
| 539 | 293 { |
| 294 ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, | |
| 295 "SSL_CTX_set_cipher_list(\"%V\") failed", | |
| 296 &conf->ciphers); | |
| 297 } | |
| 298 } | |
| 299 | |
| 563 | 300 if (conf->prefer_server_ciphers) { |
| 301 SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); | |
| 302 } | |
| 303 | |
|
3959
b1f48fa31e6c
MSIE export versions are rare now, so RSA 512 key is generated on demand
Igor Sysoev <igor@sysoev.ru>
parents:
3938
diff
changeset
|
304 SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback); |
| 539 | 305 |
| 2044 | 306 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { |
| 307 return NGX_CONF_ERROR; | |
| 308 } | |
| 309 | |
| 976 | 310 ngx_conf_merge_value(conf->builtin_session_cache, |
| 2032 | 311 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); |
| 976 | 312 |
| 313 if (conf->shm_zone == NULL) { | |
| 314 conf->shm_zone = prev->shm_zone; | |
| 315 } | |
| 539 | 316 |
| 1136 | 317 if (ngx_ssl_session_cache(&conf->ssl, &ngx_mail_ssl_sess_id_ctx, |
| 976 | 318 conf->builtin_session_cache, |
| 319 conf->shm_zone, conf->session_timeout) | |
| 320 != NGX_OK) | |
| 321 { | |
| 322 return NGX_CONF_ERROR; | |
| 323 } | |
| 573 | 324 |
| 539 | 325 return NGX_CONF_OK; |
| 326 } | |
| 563 | 327 |
| 577 | 328 |
| 976 | 329 static char * |
| 2224 | 330 ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 331 { | |
| 332 ngx_mail_ssl_conf_t *scf = conf; | |
| 333 | |
| 334 char *rv; | |
| 335 | |
| 336 rv = ngx_conf_set_flag_slot(cf, cmd, conf); | |
| 337 | |
| 338 if (rv != NGX_CONF_OK) { | |
| 339 return rv; | |
| 340 } | |
| 341 | |
| 342 if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { | |
| 343 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 344 "\"starttls\" directive conflicts with \"ssl on\""); | |
| 345 return NGX_CONF_ERROR; | |
| 346 } | |
| 347 | |
| 348 scf->file = cf->conf_file->file.name.data; | |
| 349 scf->line = cf->conf_file->line; | |
| 350 | |
| 351 return NGX_CONF_OK; | |
| 352 } | |
| 353 | |
| 354 | |
| 355 static char * | |
| 356 ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 357 { | |
| 358 ngx_mail_ssl_conf_t *scf = conf; | |
| 359 | |
| 360 char *rv; | |
| 361 | |
| 362 rv = ngx_conf_set_enum_slot(cf, cmd, conf); | |
| 363 | |
| 364 if (rv != NGX_CONF_OK) { | |
| 365 return rv; | |
| 366 } | |
| 367 | |
| 368 if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { | |
| 369 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 370 "\"ssl\" directive conflicts with \"starttls\""); | |
| 371 return NGX_CONF_ERROR; | |
| 372 } | |
| 373 | |
| 374 scf->file = cf->conf_file->file.name.data; | |
| 375 scf->line = cf->conf_file->line; | |
| 376 | |
| 377 return NGX_CONF_OK; | |
| 378 } | |
| 379 | |
| 380 | |
| 381 static char * | |
| 1136 | 382 ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 976 | 383 { |
| 1136 | 384 ngx_mail_ssl_conf_t *scf = conf; |
| 976 | 385 |
| 386 size_t len; | |
| 387 ngx_str_t *value, name, size; | |
| 388 ngx_int_t n; | |
| 389 ngx_uint_t i, j; | |
| 390 | |
| 391 value = cf->args->elts; | |
| 392 | |
| 393 for (i = 1; i < cf->args->nelts; i++) { | |
| 394 | |
| 1778 | 395 if (ngx_strcmp(value[i].data, "off") == 0) { |
| 396 scf->builtin_session_cache = NGX_SSL_NO_SCACHE; | |
| 397 continue; | |
| 398 } | |
| 399 | |
| 2032 | 400 if (ngx_strcmp(value[i].data, "none") == 0) { |
| 401 scf->builtin_session_cache = NGX_SSL_NONE_SCACHE; | |
| 402 continue; | |
| 403 } | |
| 404 | |
| 976 | 405 if (ngx_strcmp(value[i].data, "builtin") == 0) { |
| 406 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; | |
| 407 continue; | |
| 408 } | |
| 409 | |
| 410 if (value[i].len > sizeof("builtin:") - 1 | |
| 411 && ngx_strncmp(value[i].data, "builtin:", sizeof("builtin:") - 1) | |
| 412 == 0) | |
| 413 { | |
| 414 n = ngx_atoi(value[i].data + sizeof("builtin:") - 1, | |
| 415 value[i].len - (sizeof("builtin:") - 1)); | |
| 416 | |
| 417 if (n == NGX_ERROR) { | |
| 418 goto invalid; | |
| 419 } | |
| 420 | |
| 421 scf->builtin_session_cache = n; | |
| 422 | |
| 423 continue; | |
| 424 } | |
| 425 | |
| 426 if (value[i].len > sizeof("shared:") - 1 | |
| 427 && ngx_strncmp(value[i].data, "shared:", sizeof("shared:") - 1) | |
| 428 == 0) | |
| 429 { | |
| 430 len = 0; | |
| 431 | |
| 432 for (j = sizeof("shared:") - 1; j < value[i].len; j++) { | |
| 433 if (value[i].data[j] == ':') { | |
| 434 break; | |
| 435 } | |
| 436 | |
| 437 len++; | |
| 438 } | |
| 439 | |
| 440 if (len == 0) { | |
| 441 goto invalid; | |
| 442 } | |
| 443 | |
| 444 name.len = len; | |
| 445 name.data = value[i].data + sizeof("shared:") - 1; | |
| 446 | |
| 447 size.len = value[i].len - j - 1; | |
| 448 size.data = name.data + len + 1; | |
| 449 | |
| 450 n = ngx_parse_size(&size); | |
| 451 | |
| 452 if (n == NGX_ERROR) { | |
| 453 goto invalid; | |
| 454 } | |
| 455 | |
| 456 if (n < (ngx_int_t) (8 * ngx_pagesize)) { | |
| 457 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 458 "session cache \"%V\" is too small", | |
| 459 &value[i]); | |
| 460 | |
| 461 return NGX_CONF_ERROR; | |
| 462 } | |
| 463 | |
| 464 scf->shm_zone = ngx_shared_memory_add(cf, &name, n, | |
| 1136 | 465 &ngx_mail_ssl_module); |
| 976 | 466 if (scf->shm_zone == NULL) { |
| 467 return NGX_CONF_ERROR; | |
| 468 } | |
| 469 | |
|
4153
7de74ed694c8
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3992
diff
changeset
|
470 scf->shm_zone->init = ngx_ssl_session_cache_init; |
|
7de74ed694c8
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3992
diff
changeset
|
471 |
| 976 | 472 continue; |
| 473 } | |
| 474 | |
| 475 goto invalid; | |
| 476 } | |
| 477 | |
| 478 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) { | |
| 479 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; | |
| 480 } | |
| 481 | |
| 482 return NGX_CONF_OK; | |
| 483 | |
| 484 invalid: | |
| 485 | |
| 486 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 487 "invalid session cache \"%V\"", &value[i]); | |
| 488 | |
| 489 return NGX_CONF_ERROR; | |
| 490 } |