]> git.kaiwu.me - nginx.git/commitdiff
QUIC: compact initial secrets table.
authorSergey Kandaurov <pluknet@nginx.com>
Thu, 17 Jun 2021 09:35:38 +0000 (12:35 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Thu, 17 Jun 2021 09:35:38 +0000 (12:35 +0300)
src/event/quic/ngx_event_quic_protection.c

index 5bb81c87c5cd97dca24af0fab82bd04a3c7223b6..317eb094cd005b74efcd383579a99e7cba4d7aaf 100644 (file)
@@ -212,41 +212,15 @@ ngx_quic_keys_set_initial_secret(ngx_pool_t *pool, ngx_quic_keys_t *keys,
         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++) {