mirror of
https://github.com/nginx/nginx.git
synced 2025-07-26 07:06:55 +08:00
SSL: renamed session ticket key type.
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:
parent
a5b768c536
commit
6e5120a01d
@ -4238,14 +4238,14 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
|
||||
ngx_array_t *keys;
|
||||
ngx_file_info_t fi;
|
||||
ngx_pool_cleanup_t *cln;
|
||||
ngx_ssl_session_ticket_key_t *key;
|
||||
ngx_ssl_ticket_key_t *key;
|
||||
|
||||
if (paths == NULL) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
keys = ngx_array_create(cf->pool, paths->nelts,
|
||||
sizeof(ngx_ssl_session_ticket_key_t));
|
||||
sizeof(ngx_ssl_ticket_key_t));
|
||||
if (keys == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
@ -4377,7 +4377,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
|
||||
ngx_uint_t i;
|
||||
ngx_array_t *keys;
|
||||
ngx_connection_t *c;
|
||||
ngx_ssl_session_ticket_key_t *key;
|
||||
ngx_ssl_ticket_key_t *key;
|
||||
const EVP_MD *digest;
|
||||
const EVP_CIPHER *cipher;
|
||||
|
||||
@ -4508,7 +4508,7 @@ ngx_ssl_session_ticket_keys_cleanup(void *data)
|
||||
ngx_array_t *keys = data;
|
||||
|
||||
ngx_explicit_memzero(keys->elts,
|
||||
keys->nelts * sizeof(ngx_ssl_session_ticket_key_t));
|
||||
keys->nelts * sizeof(ngx_ssl_ticket_key_t));
|
||||
}
|
||||
|
||||
#else
|
||||
|
@ -161,7 +161,7 @@ typedef struct {
|
||||
u_char name[16];
|
||||
u_char hmac_key[32];
|
||||
u_char aes_key[32];
|
||||
} ngx_ssl_session_ticket_key_t;
|
||||
} ngx_ssl_ticket_key_t;
|
||||
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user