root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

QUIC Front End I/O API: Correct implementation of SSL_tick, SSL_get_tick_timeout 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
This commit is contained in:
Hugo Landau 2022-11-30 07:55:48 +00:00
parent 6848e5eeee
commit fbe2573d3b
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssl/ssl_lib.c
View File

@ -7049,9 +7049,17 @@ int SSL_tick(SSL *s)
sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
if (sc != NULL && SSL_CONNECTION_IS_DTLS(sc))
return DTLSv1_handle_timeout(s);
/*
* DTLSv1_handle_timeout returns 0 if the timer wasn't expired yet,
* which we consider a success case. Theoretically DTLSv1_handle_timeout
* can also return 0 if s is NULL or not a DTLS object, but we've
* already ruled out those possibilities above, so this is not possible
* here. Thus the only failure cases are where DTLSv1_handle_timeout
* returns -1.
*/
return DTLSv1_handle_timeout(s) >= 0;
return 0;
return 1;
}
int SSL_get_tick_timeout(SSL *s, struct timeval *tv)
@ -7066,15 +7074,13 @@ int SSL_get_tick_timeout(SSL *s, struct timeval *tv)
#endif
sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
if (sc != NULL && SSL_CONNECTION_IS_DTLS(sc)) {
if (!DTLSv1_get_timeout(s, tv)) {
tv->tv_sec = -1;
tv->tv_usec = 0;
}
if (sc != NULL && SSL_CONNECTION_IS_DTLS(sc)
&& DTLSv1_get_timeout(s, tv))
return 1;
}
return 0;
tv->tv_sec = -1;
tv->tv_usec = 0;
return 1;
}
int SSL_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc)