changeset 8802:d458101b7b81 quic

QUIC: compact initial secrets table.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 17 Jun 2021 12:35:38 +0300
parents 2029a30863e2
children 6c213bec71c2
files src/event/quic/ngx_event_quic_protection.c
diffstat 1 files changed, 6 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -212,41 +212,15 @@ ngx_quic_keys_set_initial_secret(ngx_poo
         ngx_str_t  *key;
         ngx_str_t  *prk;
     } seq[] = {
-
         /* labels per RFC 9001, 5.1. Packet Protection Keys */
         { ngx_string("tls13 client in"), &client->secret, &iss },
-        {
-            ngx_string("tls13 quic key"),
-            &client->key,
-            &client->secret,
-        },
-        {
-            ngx_string("tls13 quic iv"),
-            &client->iv,
-            &client->secret,
-        },
-        {
-            ngx_string("tls13 quic hp"),
-            &client->hp,
-            &client->secret,
-        },
+        { ngx_string("tls13 quic key"),  &client->key,    &client->secret },
+        { ngx_string("tls13 quic iv"),   &client->iv,     &client->secret },
+        { ngx_string("tls13 quic hp"),   &client->hp,     &client->secret },
         { ngx_string("tls13 server in"), &server->secret, &iss },
-        {
-            ngx_string("tls13 quic key"),
-            &server->key,
-            &server->secret,
-        },
-        {
-            ngx_string("tls13 quic iv"),
-            &server->iv,
-            &server->secret,
-        },
-        {
-            ngx_string("tls13 quic hp"),
-            &server->hp,
-            &server->secret,
-        },
-
+        { ngx_string("tls13 quic key"),  &server->key,    &server->secret },
+        { ngx_string("tls13 quic iv"),   &server->iv,     &server->secret },
+        { ngx_string("tls13 quic hp"),   &server->hp,     &server->secret },
     };
 
     for (i = 0; i < (sizeof(seq) / sizeof(seq[0])); i++) {