commit 80e1c4f8c94db0c7c8f6418b2bdcd47ad2906034
author Kazuho Oku <kazuhooku@gmail.com> Tue Nov 29 14:39:29 2022 +0900
committer Kazuho Oku <kazuhooku@gmail.com> Tue Nov 29 14:39:29 2022 +0900
tree 7c407623a84ec04d4ed701247f14ce8fe88ad670
parent 89cfbe25405fcba910cfd7f19a152b826454b78e

clear remaining ECH state even when HRR is used

lib/picotls.c

diff --git a/lib/picotls.c b/lib/picotls.c
index eceb175..dbd087c 100644
--- a/lib/picotls.c
+++ b/lib/picotls.c
@@ -2699,9 +2699,10 @@
     if (tls->ech.aead != NULL) {
         if ((ret = client_ech_select_hello(tls, message, confirm_hash_off, ECH_CONFIRMATION_SERVER_HELLO)) != 0)
             goto Exit;
-        clear_ech(&tls->ech, 0);
     }
 
+    clear_ech(&tls->ech, 0);
+
     ptls__key_schedule_update_hash(tls->key_schedule, message.base, message.len, 0);
 
     if (sh.peerkey.base != NULL) {