Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssl_module.c @ 8839:fac88e160653 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 01 Sep 2021 10:57:25 +0300
parents 05e0988a6898 419c066cb710
children e5a17d6041bd
comparison
equal deleted inserted replaced
8838:d6e191a583cc 8839:fac88e160653
828 #ifdef TLSEXT_TYPE_next_proto_neg 828 #ifdef TLSEXT_TYPE_next_proto_neg
829 SSL_CTX_set_next_protos_advertised_cb(conf->ssl.ctx, 829 SSL_CTX_set_next_protos_advertised_cb(conf->ssl.ctx,
830 ngx_http_ssl_npn_advertised, NULL); 830 ngx_http_ssl_npn_advertised, NULL);
831 #endif 831 #endif
832 832
833 if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
834 conf->prefer_server_ciphers)
835 != NGX_OK)
836 {
837 return NGX_CONF_ERROR;
838 }
839
833 if (ngx_http_ssl_compile_certificates(cf, conf) != NGX_OK) { 840 if (ngx_http_ssl_compile_certificates(cf, conf) != NGX_OK) {
834 return NGX_CONF_ERROR; 841 return NGX_CONF_ERROR;
835 } 842 }
836 843
837 if (conf->certificate_values) { 844 if (conf->certificate_values) {
858 conf->certificate_keys, conf->passwords) 865 conf->certificate_keys, conf->passwords)
859 != NGX_OK) 866 != NGX_OK)
860 { 867 {
861 return NGX_CONF_ERROR; 868 return NGX_CONF_ERROR;
862 } 869 }
863 }
864
865 if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
866 conf->prefer_server_ciphers)
867 != NGX_OK)
868 {
869 return NGX_CONF_ERROR;
870 } 870 }
871 871
872 conf->ssl.buffer_size = conf->buffer_size; 872 conf->ssl.buffer_size = conf->buffer_size;
873 873
874 if (conf->verify) { 874 if (conf->verify) {