Merge branch 'master' into kazuho/path-migration

h2o · Apr 8, 2024 · 139a143 · 139a143
2 parents dca1b91 + b6e453b
commit 139a143
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/deps/picotls b/deps/picotls
diff --git a/t/test.c b/t/test.c
@@ -744,21 +744,13 @@ int main(int argc, char **argv)
 {
     static ptls_iovec_t cert;
     static ptls_openssl_sign_certificate_t cert_signer;
-    static ptls_context_t tlsctx = {ptls_openssl_random_bytes,
-                                    &ptls_get_time,
-                                    ptls_openssl_key_exchanges,
-                                    ptls_openssl_cipher_suites,
-                                    {&cert, 1},
-                                    {{NULL}},
-                                    NULL,
-                                    NULL,
-                                    &cert_signer.super,
-                                    NULL,
-                                    0,
-                                    0,
-                                    0,
-                                    NULL,
-                                    1};
+    static ptls_context_t tlsctx = {.random_bytes = ptls_openssl_random_bytes,
+                                    .get_time = &ptls_get_time,
+                                    .key_exchanges = ptls_openssl_key_exchanges,
+                                    .cipher_suites = ptls_openssl_cipher_suites,
+                                    .certificates = {&cert, 1},
+                                    .sign_certificate = &cert_signer.super,
+                                    .require_dhe_on_psk = 1};
     quic_ctx = quicly_spec_context;
     quic_ctx.tls = &tlsctx;
     quic_ctx.transport_params.max_streams_bidi = 10;