Mercurial > hg > nginx

comparison src/event/quic/ngx_event_quic_protection.c @ 9175:f7c9cd726298

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: cleaned up now unused ngx_quic_ciphers() calls.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 20 Oct 2023 18:05:07 +0400
parents 31702c53d2db
children 8dacf87e4007
comparison
equal deleted inserted replaced
9174:31702c53d2db 9175:f7c9cd726298
853 853
854 854
855 static ngx_int_t 855 static ngx_int_t
856 ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res) 856 ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
857 { 857 {
858 u_char *pnp, *sample; 858 u_char *pnp, *sample;
859 ngx_str_t ad, out; 859 ngx_str_t ad, out;
860 ngx_uint_t i; 860 ngx_uint_t i;
861 ngx_quic_secret_t *secret; 861 ngx_quic_secret_t *secret;
862 ngx_quic_ciphers_t ciphers; 862 u_char nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
863 u_char nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
864 863
865 ad.data = res->data; 864 ad.data = res->data;
866 ad.len = ngx_quic_create_header(pkt, ad.data, &pnp); 865 ad.len = ngx_quic_create_header(pkt, ad.data, &pnp);
867 866
868 out.len = pkt->payload.len + NGX_QUIC_TAG_LEN; 867 out.len = pkt->payload.len + NGX_QUIC_TAG_LEN;
870 869
871 #ifdef NGX_QUIC_DEBUG_CRYPTO 870 #ifdef NGX_QUIC_DEBUG_CRYPTO
872 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, 871 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
873 "quic ad len:%uz %xV", ad.len, &ad); 872 "quic ad len:%uz %xV", ad.len, &ad);
874 #endif 873 #endif
875
876 if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR)
877 {
878 return NGX_ERROR;
879 }
880 874
881 secret = &pkt->keys->secrets[pkt->level].server; 875 secret = &pkt->keys->secrets[pkt->level].server;
882 876
883 ngx_memcpy(nonce, secret->iv.data, secret->iv.len); 877 ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
884 ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number); 878 ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number);
1079 1073
1080 1074
1081 ngx_int_t 1075 ngx_int_t
1082 ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn) 1076 ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn)
1083 { 1077 {
1084 u_char *p, *sample; 1078 u_char *p, *sample;
1085 size_t len; 1079 size_t len;
1086 uint64_t pn, lpn; 1080 uint64_t pn, lpn;
1087 ngx_int_t pnl; 1081 ngx_int_t pnl;
1088 ngx_str_t in, ad; 1082 ngx_str_t in, ad;
1089 ngx_uint_t key_phase; 1083 ngx_uint_t key_phase;
1090 ngx_quic_secret_t *secret; 1084 ngx_quic_secret_t *secret;
1091 ngx_quic_ciphers_t ciphers; 1085 uint8_t nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
1092 uint8_t nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
1093
1094 if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR)
1095 {
1096 return NGX_ERROR;
1097 }
1098 1086
1099 secret = &pkt->keys->secrets[pkt->level].client; 1087 secret = &pkt->keys->secrets[pkt->level].client;
1100 1088
1101 p = pkt->raw->pos; 1089 p = pkt->raw->pos;
1102 len = pkt->data + pkt->len - p; 1090 len = pkt->data + pkt->len - p;