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)

diff --git a/demos/quic/server/Makefile b/demos/quic/server/Makefile
index 7db6f085c59efb79d0cc01adb5d499b4ef95c2a1..df68c7ed6f68cb46892e75a4595887f53f0acf2a 100644 (file)
--- 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 5916be36804a8d06796fa4fd21d0051a8525cdac..4fb2d45af71778f83d8ddad095da2df60951a38a 100644 (file)
--- 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 6d4934483a4179e092fac6128471a8e384d26b08..85b439243873e4c8d8934a7091b19e5bca11336f 100644 (file)
--- 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;
 }