diff options
| -rw-r--r-- | include/internal/quic_channel.h | 1 | ||||
| -rw-r--r-- | include/internal/quic_tserver.h | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_channel.c | 5 | ||||
| -rw-r--r-- | ssl/quic/quic_tserver.c | 4 | ||||
| -rw-r--r-- | test/helpers/quictestlib.c | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h index 591c8cb76e..d2503158e4 100644 --- a/include/internal/quic_channel.h +++ b/include/internal/quic_channel.h @@ -194,6 +194,7 @@ int ossl_quic_channel_is_terminated(const QUIC_CHANNEL *ch, QUIC_TERMINATE_CAUSE *cause); int ossl_quic_channel_is_active(const QUIC_CHANNEL *ch); int ossl_quic_channel_is_handshake_complete(const QUIC_CHANNEL *ch); +int ossl_quic_channel_is_handshake_confirmed(const QUIC_CHANNEL *ch); SSL *ossl_quic_channel_get0_ssl(QUIC_CHANNEL *ch); diff --git a/include/internal/quic_tserver.h b/include/internal/quic_tserver.h index 9d7fab5d12..bfe5e32985 100644 --- a/include/internal/quic_tserver.h +++ b/include/internal/quic_tserver.h @@ -60,7 +60,7 @@ int ossl_quic_tserver_tick(QUIC_TSERVER *srv); /* * Returns 1 if we have finished the TLS handshake */ -int ossl_quic_tserver_is_handshake_complete(QUIC_TSERVER *srv); +int ossl_quic_tserver_is_handshake_confirmed(QUIC_TSERVER *srv); /* Returns 1 if the server is in any terminating or terminated state */ int ossl_quic_tserver_is_term_any(QUIC_TSERVER *srv, diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index bbb88470be..cb820fffc8 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -433,6 +433,11 @@ int ossl_quic_channel_is_handshake_complete(const QUIC_CHANNEL *ch) return ch->handshake_complete; } +int ossl_quic_channel_is_handshake_confirmed(const QUIC_CHANNEL *ch) +{ + return ch->handshake_confirmed; +} + /* * QUIC Channel: Callbacks from Miscellaneous Subsidiary Components * ================================================================ diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c index 444b59b746..4c120d0d58 100644 --- a/ssl/quic/quic_tserver.c +++ b/ssl/quic/quic_tserver.c @@ -167,9 +167,9 @@ int ossl_quic_tserver_is_terminated(QUIC_TSERVER *srv, return ossl_quic_channel_is_terminated(srv->ch, cause); } -int ossl_quic_tserver_is_handshake_complete(QUIC_TSERVER *srv) +int ossl_quic_tserver_is_handshake_confirmed(QUIC_TSERVER *srv) { - return ossl_quic_channel_is_handshake_complete(srv->ch); + return ossl_quic_channel_is_handshake_confirmed(srv->ch); } int ossl_quic_tserver_read(QUIC_TSERVER *srv, diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c index 26d52600b2..017ba54b5b 100644 --- a/test/helpers/quictestlib.c +++ b/test/helpers/quictestlib.c @@ -177,7 +177,7 @@ int qtest_create_quic_connection(QUIC_TSERVER *qtserv, SSL *clientssl) ossl_quic_tserver_tick(qtserv); servererr = ossl_quic_tserver_is_term_any(qtserv, NULL); if (!servererr) - rets = ossl_quic_tserver_is_handshake_complete(qtserv); + rets = ossl_quic_tserver_is_handshake_confirmed(qtserv); } if (clienterr && servererr) |