From: Gert Doering Date: Thu, 5 May 2022 11:38:12 +0000 (+0200) Subject: Fix trailing-whitespace errors in last patch. X-Git-Tag: v2.6_beta1~213 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3282632d9325267c850072db7545a884a1637f51;p=thirdparty%2Fopenvpn.git 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 --- diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 5eb1896c8..81f36a459 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 5b0cdcaaa..37eee8b9b 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;