From: Sergey Kandaurov <pluknet@nginx.com>
Date: Thu, 17 Jun 2021 09:35:38 +0000 (+0300)
Subject: QUIC: compact initial secrets table.
X-Git-Tag: release-1.25.0~4^2~307
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=b0bffa2bbb6f39230dbc2646aa308bef061825fd;p=nginx.git

QUIC: compact initial secrets table.
---

diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
index 5bb81c87c..317eb094c 100644
--- 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_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++) {