8000 SSL: allow configuring providers with "ssl_provider ...". by bavshin-f5 · Pull Request #710 · nginx/nginx · GitHub
[go: up one dir, main page]
Skip to content

SSL: allow configuring providers with "ssl_provider ...". #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+277 −0
Draft

SSL: allow configuring providers with "ssl_provider ...". #710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605cb20
SSL: allow configuring providers with "ssl_provider ...".
bavshin-f5 Dec 17, 2024
8e97b68
Tests: test for ssl_provider directive.
bavshin-f5 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
SSL: allow configuring providers with "ssl_provider ...".
  • Loading branch information
@bavshin-f5
bavshin-f5 committed May 26, 2025
commit 605cb206bc0ab1af8e9623948c7316317b40887f
86 changes: 86 additions & 0 deletions src/event/ngx_event_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static time_t ngx_ssl_parse_time(

static void *ngx_openssl_create_conf(ngx_cycle_t *cycle);
static char *ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static char *ngx_openssl_provider(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static void ngx_openssl_exit(ngx_cycle_t *cycle);


Expand All @@ -94,6 +95,13 @@ static ngx_command_t ngx_openssl_commands[] = {
0,
NULL },

{ ngx_string("ssl_provider"),
NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_1MORE,
ngx_openssl_provider,
0,
0,
NULL },

ngx_null_command
};

Expand Down Expand Up @@ -5982,6 +5990,84 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}


static char *
ngx_openssl_provider(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
#if (OPENSSL_VERSION_NUMBER >= 0x30200000L)

u_char *p;
ngx_uint_t i;
ngx_str_t *value;
OSSL_PARAM *param;
ngx_array_t params;

if (cf->cycle->modules_used) {
return "is specified too late";
}

value = cf->args->elts;

if (OSSL_PROVIDER_available(NULL, (char *) value[1].data)) {
ngx_conf_log_error(NGX_LOG_INFO, cf, 0,
"ssl_provider \"%V\" is already loaded", &value[1]);
return NGX_CONF_OK;
}

if (ngx_array_init(&params, cf->pool, cf->args->nelts - 1,
sizeof(OSSL_PARAM))
!= NGX_OK)
{
return NGX_CONF_ERROR;
}

ngx_memzero(params.elts, (cf->args->nelts - 1) * sizeof(OSSL_PARAM));

for (i = 2; i < cf->args->nelts; i++) {
p = (u_char *) ngx_strchr(value[i].data, '=');

if (p == NULL) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid parameter \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

param = ngx_array_push(&params);
if (param == NULL) {
return NGX_CONF_ERROR;
}

*p++ = '\0';

param->key = (char *) value[i].data;
param->data_type = OSSL_PARAM_UTF8_STRING;
param->data = p;
param->data_size = value[i].data + value[i].len - p;
}

param = ngx_array_push(&params);
if (param == NULL) {
return NGX_CONF_ERROR;
}

if (OSSL_PROVIDER_load_ex(NULL, (char* ) value[1].data,
(params.nelts > 1) ? params.elts : NULL)
== NULL)
{
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
"OSSL_PROVIDER_load_ex(\"%V\") failed", &value[1]);
return NGX_CONF_ERROR;
}

return NGX_CONF_OK;

#else

return "is not supported";

#endif
}


static void
ngx_openssl_exit(ngx_cycle_t *cycle)
{
Expand Down
3 changes: 3 additions & 0 deletions src/event/ngx_event_openssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
#ifndef OPENSSL_NO_OCSP
#include <openssl/ocsp.h>
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x30200000L)
#include <openssl/provider.h>
#endif
#include <openssl/rand.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
Expand Down
0