From aacfa55b29f2a60583427253ff6811b145dfa9e6 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 7 Jan 2020 10:59:08 -0500 Subject: QUIC: Fall-through for 0RTT (cherry picked from commit aa4d9c6f4a1d85022f593cc72d89f6c60ed6f767) --- ssl/statem/statem_srvr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index b876d17ffe..6814057769 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -72,12 +72,9 @@ static int ossl_statem_server13_read_transition(SSL *s, int mt) return 1; } break; - } else if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED) { + } else if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED + && !SSL_IS_QUIC(s)) { if (mt == SSL3_MT_END_OF_EARLY_DATA) { -#ifndef OPENSSL_NO_QUIC - if (s->quic_method != NULL) - return 0; -#endif st->hand_state = TLS_ST_SR_END_OF_EARLY_DATA; return 1; } -- 2.35.3