From: Hugo Landau Date: Fri, 12 Apr 2024 15:15:57 +0000 (+0100) Subject: Minor updates X-Git-Tag: openssl-3.5.0-alpha1~394 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6f062601bb9df5225d46cd00d6379bc125e091c;p=thirdparty%2Fopenssl.git Minor updates Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24037) --- diff --git a/demos/quic/server/Makefile b/demos/quic/server/Makefile index 7db6f085c59..df68c7ed6f6 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 5916be36804..4fb2d45af71 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -3533,10 +3533,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 6d4934483a4..85b43924387 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; }