Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 2995:cc07d164f0dc
ssl_crl
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 23 Jul 2009 12:21:26 +0000 |
parents | f33c48457d0c |
children | d6285ff81d35 |
comparison
equal
deleted
inserted
replaced
2994:f33c48457d0c | 2995:cc07d164f0dc |
---|---|
143 { ngx_string("ssl_session_timeout"), | 143 { ngx_string("ssl_session_timeout"), |
144 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | 144 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
145 ngx_conf_set_sec_slot, | 145 ngx_conf_set_sec_slot, |
146 NGX_HTTP_SRV_CONF_OFFSET, | 146 NGX_HTTP_SRV_CONF_OFFSET, |
147 offsetof(ngx_http_ssl_srv_conf_t, session_timeout), | 147 offsetof(ngx_http_ssl_srv_conf_t, session_timeout), |
148 NULL }, | |
149 | |
150 { ngx_string("ssl_crl"), | |
151 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
152 ngx_conf_set_str_slot, | |
153 NGX_HTTP_SRV_CONF_OFFSET, | |
154 offsetof(ngx_http_ssl_srv_conf_t, crl), | |
148 NULL }, | 155 NULL }, |
149 | 156 |
150 ngx_null_command | 157 ngx_null_command |
151 }; | 158 }; |
152 | 159 |
314 * sscf->protocols = 0; | 321 * sscf->protocols = 0; |
315 * sscf->certificate = { 0, NULL }; | 322 * sscf->certificate = { 0, NULL }; |
316 * sscf->certificate_key = { 0, NULL }; | 323 * sscf->certificate_key = { 0, NULL }; |
317 * sscf->dhparam = { 0, NULL }; | 324 * sscf->dhparam = { 0, NULL }; |
318 * sscf->client_certificate = { 0, NULL }; | 325 * sscf->client_certificate = { 0, NULL }; |
326 * sscf->crl = { 0, NULL }; | |
319 * sscf->ciphers.len = 0; | 327 * sscf->ciphers.len = 0; |
320 * sscf->ciphers.data = NULL; | 328 * sscf->ciphers.data = NULL; |
321 * sscf->shm_zone = NULL; | 329 * sscf->shm_zone = NULL; |
322 */ | 330 */ |
323 | 331 |
360 | 368 |
361 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); | 369 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |
362 | 370 |
363 ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate, | 371 ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate, |
364 ""); | 372 ""); |
373 ngx_conf_merge_str_value(conf->crl, prev->crl, ""); | |
365 | 374 |
366 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS); | 375 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS); |
367 | 376 |
368 | 377 |
369 conf->ssl.log = cf->log; | 378 conf->ssl.log = cf->log; |
454 conf->verify_depth) | 463 conf->verify_depth) |
455 != NGX_OK) | 464 != NGX_OK) |
456 { | 465 { |
457 return NGX_CONF_ERROR; | 466 return NGX_CONF_ERROR; |
458 } | 467 } |
468 | |
469 if (ngx_ssl_crl(cf, &conf->ssl, &conf->crl) != NGX_OK) { | |
470 return NGX_CONF_ERROR; | |
471 } | |
459 } | 472 } |
460 | 473 |
461 #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE | 474 #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE |
462 | 475 |
463 if (conf->prefer_server_ciphers) { | 476 if (conf->prefer_server_ciphers) { |