Message-ID: <7e99c14a-0d3d-b539-f173-a00d79e52811@...2181...> Date: Tue, 15 Nov 2022 13:36:21 +0100 MIME-Version: 1.0 References: <20221115122940.1947284-1-arne@...1227...> Content-Language: en-US From: Antonio Quartulli In-Reply-To: <20221115122940.1947284-1-arne@...1227...> Subject: Re: [Openvpn-devel] [PATCH] Fix logic error in checking early negotiation support check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To: Arne Schwabe , openvpn-devel@lists.sourceforge.net Hi, On 15/11/2022 13:29, Arne Schwabe wrote: > We want to check if EARLY_NEG_START is set and reserve the other bits > for future expansions. Right now we also check if all reserved bits are > zero. oops. > > Signed-off-by: Arne Schwabe > --- > src/openvpn/mudp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c > index 7c6fc816e..bdf35a8ba 100644 > --- a/src/openvpn/mudp.c > +++ b/src/openvpn/mudp.c > @@ -92,7 +92,7 @@ do_pre_decrypt_check(struct multi_context *m, > ASSERT(packet_id_read(&pin, &tmp, true)); > > /* The most significant byte is 0x0f if early negotiation is supported */ > - bool early_neg_support = (pin.id & EARLY_NEG_MASK) == EARLY_NEG_START; > + bool early_neg_support = ((pin.id & EARLY_NEG_MASK) & EARLY_NEG_START) == EARLY_NEG_START; The "== EARLY_NEG_START" is not needed. On top of that, my brain parses the expression easier without that part, because the question is "after filtering using the mask, is EARLY_NEG_START set?". The "==" imho adds logic which is not needed (both at the code and at the brain level). Cheers, > > /* All clients that support early negotiation and tls-crypt are assumed > * to also support resending the WKc in the 2nd packet */ -- Antonio Quartulli