commit cab1a3752cdb1a683662f227b241a56aee2c7ddb
author Kazuho Oku <kazuhooku@gmail.com> Tue Nov 29 11:19:21 2022 +0900
committer Kazuho Oku <kazuhooku@gmail.com> Tue Nov 29 11:19:21 2022 +0900
tree c5dfc3b2ea990950ff1cd7f355c05a7306238eba
parent 7208a7e3aae6086cec05b05b5f4230a4ed5d3457

add new extensions to the table, rely on that

lib/picotls.c

diff --git a/lib/picotls.c b/lib/picotls.c
index 85a3d39..45d6038 100644
--- a/lib/picotls.c
+++ b/lib/picotls.c
@@ -488,6 +488,8 @@
     EXT( EARLY_DATA              , CH + EE + NST );
     EXT( COOKIE                  , CH + HRR      );
     EXT( SUPPORTED_VERSIONS      , CH + SH + HRR );
+    EXT( ENCRYPTED_CLIENT_HELLO  , CH + HRR + EE );
+    EXT( ECH_OUTER_EXTENSIONS    , 0             );
     /* +-----------------------------------------+ */
     /* clang-format on */
 
@@ -2539,7 +2541,8 @@
                                   goto Exit;
                               break;
                           case PTLS_EXTENSION_TYPE_ENCRYPTED_CLIENT_HELLO:
-                              if (!(tls->ech.offered && sh->is_retry_request)) {
+                              assert(sh->is_retry_request);
+                              if (!tls->ech.offered) {
                                   ret = PTLS_ALERT_UNSUPPORTED_EXTENSION;
                                   goto Exit;
                               }