diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-05-03 19:01:12 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-05-29 08:51:12 +0200 |
| commit | 6084e04b25378a4590798a034633e90791cf74a3 (patch) | |
| tree | a79d4cc002245341a7fc1f0654e879f34568afd6 /include | |
| parent | f8503ede86115b67e1552cf332d53fe43f0cb5bd (diff) | |
QUIC: Rename SSL_tick, SSL_get_tick_timeout
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20879)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/quic_ssl.h | 6 | ||||
| -rw-r--r-- | include/openssl/ssl.h.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h index 054ec30280..f3527dbf95 100644 --- a/include/internal/quic_ssl.h +++ b/include/internal/quic_ssl.h @@ -45,9 +45,9 @@ void ossl_quic_set_connect_state(SSL *s); void ossl_quic_set_accept_state(SSL *s); __owur int ossl_quic_has_pending(const SSL *s); -__owur int ossl_quic_tick(SSL *s); -__owur int ossl_quic_get_tick_timeout(SSL *s, struct timeval *tv); -OSSL_TIME ossl_quic_get_tick_deadline(SSL *s); +__owur int ossl_quic_handle_events(SSL *s); +__owur int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv); +OSSL_TIME ossl_quic_get_event_deadline(SSL *s); __owur int ossl_quic_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *d); __owur int ossl_quic_get_wpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *d); __owur int ossl_quic_get_net_read_desired(SSL *s); diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in index 4e79ce5746..dbfd0317ae 100644 --- a/include/openssl/ssl.h.in +++ b/include/openssl/ssl.h.in @@ -2257,8 +2257,8 @@ int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets); size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); /* QUIC support */ -int SSL_tick(SSL *s); -__owur int SSL_get_tick_timeout(SSL *s, struct timeval *tv); +int SSL_handle_events(SSL *s); +__owur int SSL_get_event_timeout(SSL *s, struct timeval *tv); __owur int SSL_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc); __owur int SSL_get_wpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc); __owur int SSL_net_read_desired(SSL *s); |