diff options
| author | Hugo Landau <hlandau@openssl.org> | 2024-04-12 16:15:57 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2024-04-19 09:33:54 +0100 |
| commit | dd753de684aa94f5c6fa54589a9d855e716d1c97 (patch) | |
| tree | 0f7241bafd99378638f748b549e44a792aa0e4d5 | |
| parent | cc16b4c740587e3e4dae3b1840696c59f53430b0 (diff) | |
Minor updates
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24037)
| -rw-r--r-- | demos/quic/server/Makefile | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_impl.c | 6 | ||||
| -rw-r--r-- | ssl/quic/quic_obj.c | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/demos/quic/server/Makefile b/demos/quic/server/Makefile index 7db6f085c5..df68c7ed6f 100644 --- a/demos/quic/server/Makefile +++ b/demos/quic/server/Makefile @@ -6,6 +6,8 @@ # ../../test/certs/servercert.pem \ # ../../test/certs/serverkey.pem # +# TODO(QUIC SERVER): Add build.info. +# CFLAGS += -I../../../include -g -Wall -Wsign-compare LDFLAGS += -L../../.. LDLIBS = -lcrypto -lssl diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 9249c64cff..97192415c0 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -3515,10 +3515,8 @@ static int qctx_should_autotick(QCTX *ctx) int event_handling_mode; QUIC_OBJ *obj = ctx->obj; - for (; (event_handling_mode = obj->event_handling_mode) - == SSL_VALUE_EVENT_HANDLING_MODE_INHERIT - && obj->parent_obj != NULL; - obj = obj->parent_obj); + for (; (event_handling_mode = obj->event_handling_mode) == SSL_VALUE_EVENT_HANDLING_MODE_INHERIT + && obj->parent_obj != NULL; obj = obj->parent_obj); return event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT; } diff --git a/ssl/quic/quic_obj.c b/ssl/quic/quic_obj.c index 6d4934483a..85b4392438 100644 --- a/ssl/quic/quic_obj.c +++ b/ssl/quic/quic_obj.c @@ -106,9 +106,8 @@ int ossl_quic_obj_desires_blocking(const QUIC_OBJ *obj) unsigned int req_blocking_mode; assert(obj != NULL); - for (; (req_blocking_mode = obj->req_blocking_mode) - == QUIC_BLOCKING_MODE_INHERIT && obj->parent_obj != NULL; - obj = obj->parent_obj); + for (; (req_blocking_mode = obj->req_blocking_mode) == QUIC_BLOCKING_MODE_INHERIT + && obj->parent_obj != NULL; obj = obj->parent_obj); return req_blocking_mode != QUIC_BLOCKING_MODE_NONBLOCKING; } |