[PATCH 7 of 8] QUIC: cleaned up now unused ngx_quic_ciphers() calls

[Roman Arutyunyan]

Hi,

On Thu, Sep 07, 2023 at 07:13:59PM +0400, Sergey Kandaurov wrote:
> # HG changeset patch
> # User Sergey Kandaurov <pluknet at nginx.com>
> # Date 1694099425 -14400
> #      Thu Sep 07 19:10:25 2023 +0400
> # Node ID 8bd0104b7e6b658a1696fe7f3e2f1868ac2ae1f9
> # Parent  cdc5b59309dbdc234c71e53fca142502884e6177
> QUIC: cleaned up now unused ngx_quic_ciphers() calls.
> 
> diff --git a/src/event/quic/ngx_event_quic_openssl_compat.c b/src/event/quic/ngx_event_quic_openssl_compat.c
> --- a/src/event/quic/ngx_event_quic_openssl_compat.c
> +++ b/src/event/quic/ngx_event_quic_openssl_compat.c
> @@ -571,10 +571,9 @@ ngx_quic_compat_create_header(ngx_quic_c
>  static ngx_int_t
>  ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec, ngx_str_t *res)
>  {
> -    ngx_str_t            ad, out;
> -    ngx_quic_secret_t   *secret;
> -    ngx_quic_ciphers_t   ciphers;
> -    u_char               nonce[NGX_QUIC_IV_LEN];
> +    ngx_str_t           ad, out;
> +    ngx_quic_secret_t  *secret;
> +    u_char              nonce[NGX_QUIC_IV_LEN];
>  
>      ad.data = res->data;
>      ad.len = ngx_quic_compat_create_header(rec, ad.data, 0);
> @@ -587,11 +586,6 @@ ngx_quic_compat_create_record(ngx_quic_c
>                     "quic compat ad len:%uz %xV", ad.len, &ad);
>  #endif
>  
> -    if (ngx_quic_ciphers(rec->keys->cipher, &ciphers, rec->level) == NGX_ERROR)
> -    {
> -        return NGX_ERROR;
> -    }
> -
>      secret = &rec->keys->secret;
>  
>      ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
> diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
> --- a/src/event/quic/ngx_event_quic_protection.c
> +++ b/src/event/quic/ngx_event_quic_protection.c
> @@ -872,12 +872,11 @@ ngx_quic_keys_cleanup(void *data)
>  static ngx_int_t
>  ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
>  {
> -    u_char              *pnp, *sample;
> -    ngx_str_t            ad, out;
> -    ngx_uint_t           i;
> -    ngx_quic_secret_t   *secret;
> -    ngx_quic_ciphers_t   ciphers;
> -    u_char               nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
> +    u_char             *pnp, *sample;
> +    ngx_str_t           ad, out;
> +    ngx_uint_t          i;
> +    ngx_quic_secret_t  *secret;
> +    u_char              nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
>  
>      ad.data = res->data;
>      ad.len = ngx_quic_create_header(pkt, ad.data, &pnp);
> @@ -890,11 +889,6 @@ ngx_quic_create_packet(ngx_quic_header_t
>                     "quic ad len:%uz %xV", ad.len, &ad);
>  #endif
>  
> -    if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR)
> -    {
> -        return NGX_ERROR;
> -    }
> -
>      secret = &pkt->keys->secrets[pkt->level].server;
>  
>      ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
> @@ -1097,20 +1091,14 @@ ngx_quic_encrypt(ngx_quic_header_t *pkt,
>  ngx_int_t
>  ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn)
>  {
> -    u_char              *p, *sample;
> -    size_t               len;
> -    uint64_t             pn, lpn;
> -    ngx_int_t            pnl;
> -    ngx_str_t            in, ad;
> -    ngx_uint_t           key_phase;
> -    ngx_quic_secret_t   *secret;
> -    ngx_quic_ciphers_t   ciphers;
> -    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;
> -    }
> +    u_char             *p, *sample;
> +    size_t              len;
> +    uint64_t            pn, lpn;
> +    ngx_int_t           pnl;
> +    ngx_str_t           in, ad;
> +    ngx_uint_t          key_phase;
> +    ngx_quic_secret_t  *secret;
> +    uint8_t             nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
>  
>      secret = &pkt->keys->secrets[pkt->level].client;
>  
> _______________________________________________
> nginx-devel mailing list
> nginx-devel at nginx.org
> https://mailman.nginx.org/mailman/listinfo/nginx-devel

Looks ok