diff options
author | Hugo Landau <hlandau@openssl.org> | 2023-02-23 05:02:29 +0000 |
---|---|---|
committer | Hugo Landau <hlandau@openssl.org> | 2023-03-30 11:14:10 +0100 |
commit | c4208a6a983278316c6615980f335f685c0be472 (patch) | |
tree | d12b534e6eba7783cd08a9bbed9584e7d0ab6ef6 | |
parent | 1dd04a0fe2ffc4104db5198543ed0ec5895e9651 (diff) | |
download | openssl-new-c4208a6a983278316c6615980f335f685c0be472.tar.gz |
QUIC Thread Assisted Mode: Fix typos and use of CRYPTO_RWLOCK type
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20348)
-rw-r--r-- | include/internal/quic_thread_assist.h | 2 | ||||
-rw-r--r-- | ssl/quic/quic_channel.c | 2 | ||||
-rw-r--r-- | ssl/quic/quic_channel_local.h | 2 | ||||
-rw-r--r-- | ssl/quic/quic_local.h | 2 | ||||
-rw-r--r-- | ssl/quic/quic_reactor.c | 6 | ||||
-rw-r--r-- | ssl/quic/quic_thread_assist.c | 2 | ||||
-rw-r--r-- | ssl/quic/quic_tserver.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/include/internal/quic_thread_assist.h b/include/internal/quic_thread_assist.h index 94fcaec004..7d1b47453a 100644 --- a/include/internal/quic_thread_assist.h +++ b/include/internal/quic_thread_assist.h @@ -30,7 +30,7 @@ * SSL_tick() is called on time. This is not needed if the application always * has a call blocking to SSL_read() or SSL_write() (or another I/O function) on * a QUIC SSL object, but if the application goes for long periods of time - * without makingany such call to a QUIC SSL object, libssl cannot ordinarily + * without making any such call to a QUIC SSL object, libssl cannot ordinarily * guarantee that QUIC timeout events will be serviced in a timely fashion. * Thread assisted mode is therefore of use to applications which do not always * have an ongoing call to an I/O function on a QUIC SSL object but also do not diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 2360809295..9d8acd17fd 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -1609,7 +1609,7 @@ static int ch_tx(QUIC_CHANNEL *ch) /* * RFC 9000 s. 10.1. 'An endpoint also restarts its idle timer when * sending an ack-eliciting packet if no other ack-eliciting packets - * have been sentsince last receiving and processing a packet.' + * have been sent since last receiving and processing a packet.' */ if (sent_ack_eliciting && !ch->have_sent_ack_eliciting_since_rx) { ch_update_idle(ch); diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h index bd8f95b7a5..1e9e0e1e68 100644 --- a/ssl/quic/quic_channel_local.h +++ b/ssl/quic/quic_channel_local.h @@ -31,7 +31,7 @@ struct quic_channel_st { * passes it to us and is responsible for freeing it after channel * destruction. */ - CRYPTO_RWLOCK *mutex; + CRYPTO_MUTEX *mutex; /* * Callback used to get the current time. diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h index a20e92df2a..9aad63b742 100644 --- a/ssl/quic/quic_local.h +++ b/ssl/quic/quic_local.h @@ -55,7 +55,7 @@ struct quic_conn_st { * The mutex used to synchronise access to the QUIC_CHANNEL. We own this but * provide it to the channel. */ - CRYPTO_RWLOCK *mutex; + CRYPTO_MUTEX *mutex; /* Our single bidirectional application data stream. */ QUIC_STREAM *stream0; diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c index cae8dffe0e..d9826e7e94 100644 --- a/ssl/quic/quic_reactor.c +++ b/ssl/quic/quic_reactor.c @@ -133,7 +133,7 @@ int ossl_quic_reactor_tick(QUIC_REACTOR *rtor, uint32_t flags) static int poll_two_fds(int rfd, int rfd_want_read, int wfd, int wfd_want_write, OSSL_TIME deadline, - CRYPTO_RWLOCK *mutex) + CRYPTO_MUTEX *mutex) { #if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN) fd_set rfd_set, wfd_set, efd_set; @@ -282,7 +282,7 @@ static int poll_descriptor_to_fd(const BIO_POLL_DESCRIPTOR *d, int *fd) static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read, const BIO_POLL_DESCRIPTOR *w, int w_want_write, OSSL_TIME deadline, - CRYPTO_RWLOCK *mutex) + CRYPTO_MUTEX *mutex) { int rfd, wfd; @@ -307,7 +307,7 @@ static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read, int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor, int (*pred)(void *arg), void *pred_arg, uint32_t flags, - CRYPTO_RWLOCK *mutex) + CRYPTO_MUTEX *mutex) { int res; diff --git a/ssl/quic/quic_thread_assist.c b/ssl/quic/quic_thread_assist.c index 93d246ea8e..b2917871ab 100644 --- a/ssl/quic/quic_thread_assist.c +++ b/ssl/quic/quic_thread_assist.c @@ -14,7 +14,7 @@ #include "internal/thread_arch.h" #include "internal/quic_thread_assist.h" -#if !defined(OPENSSL_NO_QUIC) && !defined(OPENSSL_NO_THREAD_POOL) +#if !defined(OPENSSL_NO_QUIC) && defined(OPENSSL_THREADS) /* Main loop for the QUIC assist thread. */ static unsigned int assist_thread_main(void *arg) diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c index 27addc9be5..a0660458d4 100644 --- a/ssl/quic/quic_tserver.c +++ b/ssl/quic/quic_tserver.c @@ -25,7 +25,7 @@ struct quic_tserver_st { QUIC_CHANNEL *ch; /* The mutex we give to the QUIC channel. */ - CRYPTO_RWLOCK *mutex; + CRYPTO_MUTEX *mutex; /* SSL_CTX for creating the underlying TLS connection */ SSL_CTX *ctx; |