IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

SSL: simplify ngx_ssl_preserve_passwords() interface.

Browse Source
This commit is contained in:
Pavel Pautov 2025-01-23 22:07:58 -08:00
parent f512483571
commit b6ac92d28d
8 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/event/ngx_event_openssl.c
View File

@ -1249,24 +1249,16 @@ cleanup:
}
ngx_array_t *
ngx_int_t
ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords)
{
ngx_str_t *opwd, *pwd;
ngx_uint_t i;
ngx_array_t opwds;
ngx_pool_cleanup_t *cln;
static ngx_array_t empty_passwords;
if (passwords == NULL) {
/*
* If there are no passwords, an empty array is used
* to make sure OpenSSL's default password callback
* won't block on reading from stdin.
*/
return &empty_passwords;
if (passwords == NULL || passwords->pool == cf->pool) {
return NGX_OK;
}
/*
@ -1275,21 +1267,17 @@ ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords)
* runtime they have to be copied to the configuration pool.
*/
if (passwords->pool == cf->pool || passwords == &empty_passwords) {
return passwords;
}
opwds = *passwords;
if (ngx_array_init(passwords, cf->pool, opwds.nelts, sizeof(ngx_str_t))
!= NGX_OK)
{
return NULL;
return NGX_ERROR;
}
cln = ngx_pool_cleanup_add(cf->pool, 0);
if (cln == NULL) {
return NULL;
return NGX_ERROR;
}
cln->handler = ngx_ssl_passwords_cleanup;
@ -1301,7 +1289,7 @@ ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords)
pwd = ngx_array_push(passwords);
if (pwd == NULL) {
return NULL;
return NGX_ERROR;
}
pwd->len = opwd[i].len;
@ -1309,13 +1297,13 @@ ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords)
if (pwd->data == NULL) {
passwords->nelts--;
return NULL;
return NGX_ERROR;
}
ngx_memcpy(pwd->data, opwd[i].data, opwd[i].len);
}
return passwords;
return NGX_OK;
}

3
src/event/ngx_event_openssl.h
View File

@ -248,8 +248,7 @@ void *ngx_ssl_cache_connection_fetch(ngx_ssl_cache_t *cache, ngx_pool_t *pool,
ngx_uint_t index, char **err, ngx_str_t *path, void *data);
ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
ngx_array_t *passwords);
ngx_int_t ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords);
ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file);
ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name);
ngx_int_t ngx_ssl_early_data(ngx_conf_t *cf, ngx_ssl_t *ssl,

6
src/http/modules/ngx_http_grpc_module.c
View File

@ -5080,9 +5080,9 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
if (glcf->upstream.ssl_certificate->lengths
|| glcf->upstream.ssl_certificate_key->lengths)
{
glcf->upstream.ssl_passwords =
ngx_ssl_preserve_passwords(cf, glcf->upstream.ssl_passwords);
if (glcf->upstream.ssl_passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, glcf->upstream.ssl_passwords)
!= NGX_OK)
{
return NGX_ERROR;
}

6
src/http/modules/ngx_http_proxy_module.c
View File

@ -5340,9 +5340,9 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
if (plcf->upstream.ssl_certificate->lengths
|| plcf->upstream.ssl_certificate_key->lengths)
{
plcf->upstream.ssl_passwords =
ngx_ssl_preserve_passwords(cf, plcf->upstream.ssl_passwords);
if (plcf->upstream.ssl_passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, plcf->upstream.ssl_passwords)
!= NGX_OK)
{
return NGX_ERROR;
}

3
src/http/modules/ngx_http_ssl_module.c
View File

@ -988,8 +988,7 @@ found:
}
}
conf->passwords = ngx_ssl_preserve_passwords(cf, conf->passwords);
if (conf->passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, conf->passwords) != NGX_OK) {
return NGX_ERROR;
}

6
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -2688,9 +2688,9 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
if (uwcf->upstream.ssl_certificate->lengths
|| uwcf->upstream.ssl_certificate_key->lengths)
{
uwcf->upstream.ssl_passwords =
ngx_ssl_preserve_passwords(cf, uwcf->upstream.ssl_passwords);
if (uwcf->upstream.ssl_passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, uwcf->upstream.ssl_passwords)
!= NGX_OK)
{
return NGX_ERROR;
}

4
src/stream/ngx_stream_proxy_module.c
View File

@ -2421,9 +2421,7 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
if (pscf->ssl_certificate->lengths
|| pscf->ssl_certificate_key->lengths)
{
pscf->ssl_passwords =
ngx_ssl_preserve_passwords(cf, pscf->ssl_passwords);
if (pscf->ssl_passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, pscf->ssl_passwords) != NGX_OK) {
return NGX_ERROR;
}

3
src/stream/ngx_stream_ssl_module.c
View File

@ -1207,8 +1207,7 @@ found:
}
}
conf->passwords = ngx_ssl_preserve_passwords(cf, conf->passwords);
if (conf->passwords == NULL) {
if (ngx_ssl_preserve_passwords(cf, conf->passwords) != NGX_OK) {
return NGX_ERROR;
}