diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-09-01 10:57:25 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-09-01 10:57:25 +0300 |
| commit | 72af057584ac7cb3822e4898f5566f7d27c70ebd (patch) | |
| tree | 929f00aca9e2178b239e3baaf7e3d0b8a090be5e /src/mail/ngx_mail_ssl_module.c | |
| parent | 68d4325de08053f4cb0db590dc72ef9494c33bd6 (diff) | |
| parent | a80a0601b95f58146381d8f208d4de293da7a239 (diff) | |
| download | nginx-72af057584ac7cb3822e4898f5566f7d27c70ebd.tar.gz nginx-72af057584ac7cb3822e4898f5566f7d27c70ebd.zip | |
Merged with the default branch.
Diffstat (limited to 'src/mail/ngx_mail_ssl_module.c')
| -rw-r--r-- | src/mail/ngx_mail_ssl_module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index 7eae83e25..09cc425d6 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -394,6 +394,13 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) cln->handler = ngx_ssl_cleanup_ctx; cln->data = &conf->ssl; + if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers, + conf->prefer_server_ciphers) + != NGX_OK) + { + return NGX_CONF_ERROR; + } + if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates, conf->certificate_keys, conf->passwords) != NGX_OK) @@ -430,13 +437,6 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) } } - if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers, - conf->prefer_server_ciphers) - != NGX_OK) - { - return NGX_CONF_ERROR; - } - if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { return NGX_CONF_ERROR; } |