IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: cleaned up now unused ngx_quic_ciphers() calls.

Browse Source
This commit is contained in:
Sergey Kandaurov 2023-10-20 18:05:07 +04:00
parent 4f60ee789e
commit d15f8f2c85
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event/quic/ngx_event_quic_openssl_compat.c
View File

@ -582,10 +582,9 @@ ngx_quic_compat_create_header(ngx_quic_compat_record_t *rec, u_char *out,
static ngx_int_t static ngx_int_t
ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec, ngx_str_t *res) ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec, ngx_str_t *res)
{ {
ngx_str_t ad, out; ngx_str_t ad, out;
ngx_quic_secret_t *secret; ngx_quic_secret_t *secret;
ngx_quic_ciphers_t ciphers; u_char nonce[NGX_QUIC_IV_LEN];
u_char nonce[NGX_QUIC_IV_LEN];
ad.data = res->data; ad.data = res->data;
ad.len = ngx_quic_compat_create_header(rec, ad.data, 0); ad.len = ngx_quic_compat_create_header(rec, ad.data, 0);
@ -598,11 +597,6 @@ ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec, ngx_str_t *res)
"quic compat ad len:%uz %xV", ad.len, &ad); "quic compat ad len:%uz %xV", ad.len, &ad);
#endif #endif
if (ngx_quic_ciphers(rec->keys->cipher, &ciphers, rec->level) == NGX_ERROR)
{
return NGX_ERROR;
}
secret = &rec->keys->secret; secret = &rec->keys->secret;
ngx_memcpy(nonce, secret->iv.data, secret->iv.len); ngx_memcpy(nonce, secret->iv.data, secret->iv.len);

38
src/event/quic/ngx_event_quic_protection.c
View File

@ -855,12 +855,11 @@ ngx_quic_keys_cleanup(ngx_quic_keys_t *keys)
static ngx_int_t static ngx_int_t
ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res) ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
{ {
u_char *pnp, *sample; u_char *pnp, *sample;
ngx_str_t ad, out; ngx_str_t ad, out;
ngx_uint_t i; ngx_uint_t i;
ngx_quic_secret_t *secret; ngx_quic_secret_t *secret;
ngx_quic_ciphers_t ciphers; u_char nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
u_char nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
ad.data = res->data; ad.data = res->data;
ad.len = ngx_quic_create_header(pkt, ad.data, &pnp); ad.len = ngx_quic_create_header(pkt, ad.data, &pnp);
@ -873,11 +872,6 @@ ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
"quic ad len:%uz %xV", ad.len, &ad); "quic ad len:%uz %xV", ad.len, &ad);
#endif #endif
if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR)
{
return NGX_ERROR;
}
secret = &pkt->keys->secrets[pkt->level].server; secret = &pkt->keys->secrets[pkt->level].server;
ngx_memcpy(nonce, secret->iv.data, secret->iv.len); ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
@ -1081,20 +1075,14 @@ ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_str_t *res)
ngx_int_t ngx_int_t
ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn) ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn)
{ {
u_char *p, *sample; u_char *p, *sample;
size_t len; size_t len;
uint64_t pn, lpn; uint64_t pn, lpn;
ngx_int_t pnl; ngx_int_t pnl;
ngx_str_t in, ad; ngx_str_t in, ad;
ngx_uint_t key_phase; ngx_uint_t key_phase;
ngx_quic_secret_t *secret; ngx_quic_secret_t *secret;
ngx_quic_ciphers_t ciphers; uint8_t nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
uint8_t nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR)
{
return NGX_ERROR;
}
secret = &pkt->keys->secrets[pkt->level].client; secret = &pkt->keys->secrets[pkt->level].client;