mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-26 07:06:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SSL: renamed session ticket key type.

Browse Source 
The ngx_ssl_session_ticket_key_t is way too long, renamed to
ngx_ssl_ticket_key_t to simplify writing code.
This commit is contained in:
Maxim Dounin 2022-10-12 20:14:47 +03:00
parent a5b768c536
commit 6e5120a01d
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/event/ngx_event_openssl.c
View File

@ -4229,23 +4229,23 @@ ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
ngx_int_t ngx_int_t
ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths) ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
{ {
u_char buf[80]; u_char buf[80];
size_t size; size_t size;
ssize_t n; ssize_t n;
ngx_str_t *path; ngx_str_t *path;
ngx_file_t file; ngx_file_t file;
ngx_uint_t i; ngx_uint_t i;
ngx_array_t *keys; ngx_array_t *keys;
ngx_file_info_t fi; ngx_file_info_t fi;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;
ngx_ssl_session_ticket_key_t *key; ngx_ssl_ticket_key_t *key;
if (paths == NULL) { if (paths == NULL) {
return NGX_OK; return NGX_OK;
} }
keys = ngx_array_create(cf->pool, paths->nelts, keys = ngx_array_create(cf->pool, paths->nelts,
sizeof(ngx_ssl_session_ticket_key_t)); sizeof(ngx_ssl_ticket_key_t));
if (keys == NULL) { if (keys == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -4372,14 +4372,14 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx, unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
HMAC_CTX *hctx, int enc) HMAC_CTX *hctx, int enc)
{ {
size_t size; size_t size;
SSL_CTX *ssl_ctx; SSL_CTX *ssl_ctx;
ngx_uint_t i; ngx_uint_t i;
ngx_array_t *keys; ngx_array_t *keys;
ngx_connection_t *c; ngx_connection_t *c;
ngx_ssl_session_ticket_key_t *key; ngx_ssl_ticket_key_t *key;
const EVP_MD *digest; const EVP_MD *digest;
const EVP_CIPHER *cipher; const EVP_CIPHER *cipher;
c = ngx_ssl_get_connection(ssl_conn); c = ngx_ssl_get_connection(ssl_conn);
ssl_ctx = c->ssl->session_ctx; ssl_ctx = c->ssl->session_ctx;
@ -4508,7 +4508,7 @@ ngx_ssl_session_ticket_keys_cleanup(void *data)
ngx_array_t *keys = data; ngx_array_t *keys = data;
ngx_explicit_memzero(keys->elts, ngx_explicit_memzero(keys->elts,
keys->nelts * sizeof(ngx_ssl_session_ticket_key_t)); keys->nelts * sizeof(ngx_ssl_ticket_key_t));
} }
#else #else

2
src/event/ngx_event_openssl.h
View File

@ -161,7 +161,7 @@ typedef struct {
u_char name[16]; u_char name[16];
u_char hmac_key[32]; u_char hmac_key[32];
u_char aes_key[32]; u_char aes_key[32];
} ngx_ssl_session_ticket_key_t; } ngx_ssl_ticket_key_t;
#endif #endif