Hi, On Thu, May 05, 2022 at 12:18:11PM +0200, Gert Doering wrote: > All the comments and whitespace bits have been fixed-on-the-fly > as instructed. I have also fixed the "Return *true* if this packet..." > comment before do_pre_decrypt_check() and rewrapped the very long > comment lines in mudp.c (why did uncrustify not find this?).
I should not have done that, because my tree wasn't set up properly
with pre-commit-check yet - so I introduced new whitespace errors.
These have been fixed in a followup commit, which (it is only whitespace)
I'm not running through the formal process.
The patch is appended below. It's committed as
commit 3282632d9325267c850072db7545a884a1637f51 (HEAD -> master)
Author: Gert Doering <g...@greenie.muc.de>
Date: Thu May 5 13:38:12 2022 +0200
Fix trailing-whitespace errors in last patch.
When rewrapping comments and a single code line in b364711486dc6,
some trailing whitespace escaped. Fix.
Signed-off-by: Gert Doering <g...@greenie.muc.de>
sorry,
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
From 3282632d9325267c850072db7545a884a1637f51 Mon Sep 17 00:00:00 2001
From: Gert Doering <g...@greenie.muc.de>
Date: Thu, 5 May 2022 13:38:12 +0200
Subject: [PATCH] Fix trailing-whitespace errors in last patch.
When rewrapping comments and a single code line in b364711486dc6,
some trailing whitespace escaped. Fix.
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
src/openvpn/mudp.c | 6 +++---
src/openvpn/ssl.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 5eb1896c..81f36a45 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -178,8 +178,8 @@ multi_get_create_instance_udp(struct multi_context *m, bool *floated)
if (do_pre_decrypt_check(m, &state, real))
{
/* This is an unknown session but with valid tls-auth/tls-crypt
- * (or no auth at all). If this is the initial packet of a
- * session, we just send a reply with a HMAC session id and
+ * (or no auth at all). If this is the initial packet of a
+ * session, we just send a reply with a HMAC session id and
* do not generate a session slot */
if (frequency_limit_event_allowed(m->new_connection_limiter))
@@ -191,7 +191,7 @@ multi_get_create_instance_udp(struct multi_context *m, bool *floated)
mi->did_real_hash = true;
multi_assign_peer_id(m, mi);
}
- /* If we have a session id already, ensure that the
+ /* If we have a session id already, ensure that the
* state is using the same */
if (session_id_defined(&state.server_session_id)
&& session_id_defined((&state.peer_session_id)))
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 5b0cdcaa..37eee8b9 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1285,7 +1285,7 @@ tls_auth_standalone_init(struct tls_options *tls_options,
/* get initial frame parms, still need to finalize */
tas->frame = tls_options->frame;
- packet_id_init(&tas->tls_wrap.opt.packet_id, tls_options->replay_window,
+ packet_id_init(&tas->tls_wrap.opt.packet_id, tls_options->replay_window,
tls_options->replay_time, "TAS", 0);
return tas;
--
2.36.0
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
