diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-07-20 12:59:24 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-07-20 12:59:24 +0000 |
| commit | e61ba26744d404a83eba0bf560b6697c453e6705 (patch) | |
| tree | 37b1666249ee15ed67ad53235db182b3be1602ff /src/http | |
| parent | 2551f4a55ddcb60460fc65fe7a3466647581d277 (diff) | |
| download | nginx-e61ba26744d404a83eba0bf560b6697c453e6705.tar.gz nginx-e61ba26744d404a83eba0bf560b6697c453e6705.tar.bz2 | |
MSIE export versions are rare now, so RSA 512 key is generated on demand
and is shared among all hosts instead of pregenerating for every HTTPS host
on configuraiton phase. This decreases start time for configuration with
large number of HTTPS hosts.
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index 1860050d3..52c9196ce 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -465,9 +465,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) } /* a temporary 512-bit RSA key is required for export versions of MSIE */ - if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) { - return NGX_CONF_ERROR; - } + SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback); if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { return NGX_CONF_ERROR; |
