Mercurial > hg > nginx

comparison src/event/ngx_event_openssl.c @ 8081:4eeb53743d25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 12 Oct 2022 20:14:47 +0300
parents f106f4a68faf
children c71e113b57d8
comparison
equal deleted inserted replaced
8080:bf02161f291e 8081:4eeb53743d25
4227 #ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 4227 #ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB
4228 4228
4229 ngx_int_t 4229 ngx_int_t
4230 ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths) 4230 ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
4231 { 4231 {
4232 u_char buf[80]; 4232 u_char buf[80];
4233 size_t size; 4233 size_t size;
4234 ssize_t n; 4234 ssize_t n;
4235 ngx_str_t *path; 4235 ngx_str_t *path;
4236 ngx_file_t file; 4236 ngx_file_t file;
4237 ngx_uint_t i; 4237 ngx_uint_t i;
4238 ngx_array_t *keys; 4238 ngx_array_t *keys;
4239 ngx_file_info_t fi; 4239 ngx_file_info_t fi;
4240 ngx_pool_cleanup_t *cln; 4240 ngx_pool_cleanup_t *cln;
4241 ngx_ssl_session_ticket_key_t *key; 4241 ngx_ssl_ticket_key_t *key;
4242 4242
4243 if (paths == NULL) { 4243 if (paths == NULL) {
4244 return NGX_OK; 4244 return NGX_OK;
4245 } 4245 }
4246 4246
4247 keys = ngx_array_create(cf->pool, paths->nelts, 4247 keys = ngx_array_create(cf->pool, paths->nelts,
4248 sizeof(ngx_ssl_session_ticket_key_t)); 4248 sizeof(ngx_ssl_ticket_key_t));
4249 if (keys == NULL) { 4249 if (keys == NULL) {
4250 return NGX_ERROR; 4250 return NGX_ERROR;
4251 } 4251 }
4252 4252
4253 cln = ngx_pool_cleanup_add(cf->pool, 0); 4253 cln = ngx_pool_cleanup_add(cf->pool, 0);
4370 static int 4370 static int
4371 ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, 4371 ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
4372 unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx, 4372 unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
4373 HMAC_CTX *hctx, int enc) 4373 HMAC_CTX *hctx, int enc)
4374 { 4374 {
4375 size_t size; 4375 size_t size;
4376 SSL_CTX *ssl_ctx; 4376 SSL_CTX *ssl_ctx;
4377 ngx_uint_t i; 4377 ngx_uint_t i;
4378 ngx_array_t *keys; 4378 ngx_array_t *keys;
4379 ngx_connection_t *c; 4379 ngx_connection_t *c;
4380 ngx_ssl_session_ticket_key_t *key; 4380 ngx_ssl_ticket_key_t *key;
4381 const EVP_MD *digest; 4381 const EVP_MD *digest;
4382 const EVP_CIPHER *cipher; 4382 const EVP_CIPHER *cipher;
4383 4383
4384 c = ngx_ssl_get_connection(ssl_conn); 4384 c = ngx_ssl_get_connection(ssl_conn);
4385 ssl_ctx = c->ssl->session_ctx; 4385 ssl_ctx = c->ssl->session_ctx;
4386 4386
4387 #ifdef OPENSSL_NO_SHA256 4387 #ifdef OPENSSL_NO_SHA256
4506 ngx_ssl_session_ticket_keys_cleanup(void *data) 4506 ngx_ssl_session_ticket_keys_cleanup(void *data)
4507 { 4507 {
4508 ngx_array_t *keys = data; 4508 ngx_array_t *keys = data;
4509 4509
4510 ngx_explicit_memzero(keys->elts, 4510 ngx_explicit_memzero(keys->elts,
4511 keys->nelts * sizeof(ngx_ssl_session_ticket_key_t)); 4511 keys->nelts * sizeof(ngx_ssl_ticket_key_t));
4512 } 4512 }
4513 4513
4514 #else 4514 #else
4515 4515
4516 ngx_int_t 4516 ngx_int_t