Skip to content

chore: code consistency of ffi functions #515

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

Merged
zhuizhuhaomeng merged 2 commits into from
Nov 8, 2026
Merged

chore: code consistency of ffi functions #515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36906e8
chore: code consistency of ffi functions
willmafh Nov 2, 2025
637eb9c
change: merge master into ffi-functions-consistency.
zhuizhuhaomeng Nov 8, 2026
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
22 changes: 13 additions & 9 deletions lib/ngx/ssl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,17 @@ if subsystem == 'http' then
void *ngx_http_lua_ffi_get_upstream_ssl_pointer(
ngx_http_request_t *r, char **err);

int ngx_http_lua_ffi_set_cert(void *r, void *cdata, char **err);
int ngx_http_lua_ffi_set_cert(ngx_http_request_t *r, void *cdata,
char **err);

int ngx_http_lua_ffi_set_priv_key(void *r, void *cdata, char **err);
int ngx_http_lua_ffi_set_priv_key(ngx_http_request_t *r, void *cdata,
char **err);

void ngx_http_lua_ffi_free_cert(void *cdata);

void ngx_http_lua_ffi_free_priv_key(void *cdata);

int ngx_http_lua_ffi_ssl_verify_client(void *r,
int ngx_http_lua_ffi_ssl_verify_client(ngx_http_request_t *r,
void *client_certs, void *trusted_certs, int depth, char **err);

int ngx_http_lua_ffi_ssl_client_random(ngx_http_request_t *r,
Expand All @@ -135,12 +137,12 @@ if subsystem == 'http' then
int ngx_http_lua_ffi_ssl_session_master_key(ngx_http_request_t *r,
const unsigned char *out, size_t *outlen, char **err);

int ngx_http_lua_ffi_ssl_export_keying_material(void *r,
int ngx_http_lua_ffi_ssl_export_keying_material(ngx_http_request_t *r,
unsigned char *out, size_t out_size,
const char *label, size_t llen,
const unsigned char *ctx, size_t ctxlen, int use_ctx, char **err);

int ngx_http_lua_ffi_ssl_export_keying_material_early(void *r,
int ngx_http_lua_ffi_ssl_export_keying_material_early(ngx_http_request_t *r,
unsigned char *out, size_t out_size,
const char *label, size_t llen,
const unsigned char *ctx, size_t ctxlen, char **err);
Expand Down Expand Up @@ -242,23 +244,25 @@ elseif subsystem == 'stream' then
size_t der_len, char **err);

void *ngx_stream_lua_ffi_get_req_ssl_pointer(ngx_stream_lua_request_t *r,
char **err);
char **err);

void *ngx_stream_lua_ffi_get_req_ssl_ctx(ngx_stream_lua_request_t *r,
char **err);

void *ngx_stream_lua_ffi_get_upstream_ssl_pointer(
ngx_stream_lua_request_t *r, char **err);

int ngx_stream_lua_ffi_set_cert(void *r, void *cdata, char **err);
int ngx_stream_lua_ffi_set_cert(ngx_stream_lua_request_t *r, void *cdata,
char **err);

int ngx_stream_lua_ffi_set_priv_key(void *r, void *cdata, char **err);
int ngx_stream_lua_ffi_set_priv_key(ngx_stream_lua_request_t *r,
void *cdata, char **err);

void ngx_stream_lua_ffi_free_cert(void *cdata);

void ngx_stream_lua_ffi_free_priv_key(void *cdata);

int ngx_stream_lua_ffi_ssl_verify_client(void *r,
int ngx_stream_lua_ffi_ssl_verify_client(ngx_stream_lua_request_t *r,
void *client_certs, void *trusted_certs, int depth, char **err);

int ngx_stream_lua_ffi_ssl_client_random(ngx_stream_lua_request_t *r,
Expand Down
Loading