Mercurial > hg > nginx

diff src/http/modules/ngx_http_ssl_module.c @ 8589:93be5658a250 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: reverted previous 3 commits. Changes were intended for the test repository.
author Vladimir Homutov <vl@nginx.com>
date Mon, 19 Oct 2020 10:32:53 +0300
parents 7621ffaa79b3
children 71b7453fb11f
line wrap: on
line diff
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -119,13 +119,6 @@ static ngx_command_t  ngx_http_ssl_comma
       0,
       NULL },
 
-    { ngx_string("ssl_keys_file"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_ssl_srv_conf_t, keys_file),
-      NULL },
-
     { ngx_string("ssl_dhparam"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -612,7 +605,6 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t 
      *     sscf->trusted_certificate = { 0, NULL };
      *     sscf->crl = { 0, NULL };
      *     sscf->ciphers = { 0, NULL };
-     *     sscf->keys_file = { 0, NULL };
      *     sscf->shm_zone = NULL;
      *     sscf->ocsp_responder = { 0, NULL };
      *     sscf->stapling_file = { 0, NULL };
@@ -684,8 +676,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *
 
     ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);
 
-    ngx_conf_merge_str_value(conf->keys_file, prev->keys_file, "");
-
     ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");
 
     ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate,
@@ -922,17 +912,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *
         return NGX_CONF_ERROR;
     }
 
-    if (conf->keys_file.len) {
-
-        conf->ssl.keylog = ngx_conf_open_file(cf->cycle, &conf->keys_file);
-
-        if (conf->ssl.keylog == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        SSL_CTX_set_keylog_callback(conf->ssl.ctx, ngx_ssl_keylogger);
-    }
-
     if (conf->stapling) {
 
         if (ngx_ssl_stapling(cf, &conf->ssl, &conf->stapling_file,