diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-05-03 19:09:05 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-05-29 08:51:12 +0200 |
| commit | 7ea497134733f8197f359fe3243ad24e97df0f1a (patch) | |
| tree | ef06baa3a9912e9e8899c16ee681e214ddd64749 /include | |
| parent | 6084e04b25378a4590798a034633e90791cf74a3 (diff) | |
QUIC APL: Change SSL_get_event_timeout API design
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 | 3 | ||||
| -rw-r--r-- | include/openssl/ssl.h.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h index f3527dbf95..f8469c4fa7 100644 --- a/include/internal/quic_ssl.h +++ b/include/internal/quic_ssl.h @@ -46,7 +46,8 @@ void ossl_quic_set_accept_state(SSL *s); __owur int ossl_quic_has_pending(const SSL *s); __owur int ossl_quic_handle_events(SSL *s); -__owur int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv); +__owur int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv, + int *is_infinite); 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); diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in index dbfd0317ae..d580c8f19f 100644 --- a/include/openssl/ssl.h.in +++ b/include/openssl/ssl.h.in @@ -2258,7 +2258,7 @@ size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); /* QUIC support */ int SSL_handle_events(SSL *s); -__owur int SSL_get_event_timeout(SSL *s, struct timeval *tv); +__owur int SSL_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite); __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); |