diff src/event/quic/ngx_event_quic_protection.c @ 8917:e50f77a2d0b0 quic

QUIC: removed ngx_quic_keys_new(). The ngx_quic_keys_t structure is now exposed.
author Vladimir Homutov <vl@nginx.com>
date Wed, 27 Jul 2022 17:31:16 +0400
parents f2925c80401c
children 172705615d04
line wrap: on
line diff
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -10,16 +10,11 @@
 #include <ngx_event_quic_connection.h>
 
 
-/* RFC 5116, 5.1 and RFC 8439, 2.3 for all supported ciphers */
-#define NGX_QUIC_IV_LEN               12
 /* RFC 9001, 5.4.1.  Header Protection Application: 5-byte mask */
 #define NGX_QUIC_HP_LEN               5
 
 #define NGX_QUIC_AES_128_KEY_LEN      16
 
-/* largest hash used in TLS is SHA-384 */
-#define NGX_QUIC_MAX_MD_SIZE          48
-
 #define NGX_AES_128_GCM_SHA256        0x1301
 #define NGX_AES_256_GCM_SHA384        0x1302
 #define NGX_CHACHA20_POLY1305_SHA256  0x1303
@@ -33,45 +28,12 @@
 
 
 typedef struct {
-    size_t                    len;
-    u_char                    data[NGX_QUIC_MAX_MD_SIZE];
-} ngx_quic_md_t;
-
-
-typedef struct {
-    size_t                    len;
-    u_char                    data[NGX_QUIC_IV_LEN];
-} ngx_quic_iv_t;
-
-
-typedef struct {
     const ngx_quic_cipher_t  *c;
     const EVP_CIPHER         *hp;
     const EVP_MD             *d;
 } ngx_quic_ciphers_t;
 
 
-typedef struct ngx_quic_secret_s {
-    ngx_quic_md_t             secret;
-    ngx_quic_md_t             key;
-    ngx_quic_iv_t             iv;
-    ngx_quic_md_t             hp;
-} ngx_quic_secret_t;
-
-
-typedef struct {
-    ngx_quic_secret_t         client;
-    ngx_quic_secret_t         server;
-} ngx_quic_secrets_t;
-
-
-struct ngx_quic_keys_s {
-    ngx_quic_secrets_t        secrets[NGX_QUIC_ENCRYPTION_LAST];
-    ngx_quic_secrets_t        next_key;
-    ngx_uint_t                cipher;
-};
-
-
 typedef struct {
     size_t                    out_len;
     u_char                   *out;
@@ -721,13 +683,6 @@ ngx_quic_keys_set_encryption_secret(ngx_
 }
 
 
-ngx_quic_keys_t *
-ngx_quic_keys_new(ngx_pool_t *pool)
-{
-    return ngx_pcalloc(pool, sizeof(ngx_quic_keys_t));
-}
-
-
 ngx_uint_t
 ngx_quic_keys_available(ngx_quic_keys_t *keys,
     enum ssl_encryption_level_t level)