From: Antonio Quartulli Date: Wed, 16 Aug 2017 12:18:06 +0000 (+0800) Subject: ntlm: avoid breaking anti-aliasing rules X-Git-Tag: v2.4.4~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30e0778a57a8db3d57d144471a869647037a115b;p=thirdparty%2Fopenvpn.git ntlm: avoid breaking anti-aliasing rules The problem is visible when compiling with -O2: ntlm.c: In function ‘ntlm_phase_3’: ntlm.c:305:9: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if ((*((long *)&buf2[0x14]) & 0x00800000) == 0x00800000) The spec suggests to interpret those 4 bytes as a long, but this needs to be done carefully. Signed-off-by: Antonio Quartulli Acked-by: Steffan Karger Message-Id: <20170816121806.26471-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15268.html Signed-off-by: David Sommerseth (cherry picked from commit e84b6994b4d2b53bcebd5415a58de4cecd411a7b) --- diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index 167c10b80..077fa3e2a 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -302,7 +302,21 @@ ntlm_phase_3(const struct http_proxy_info *p, const char *phase_2, /* Add target information block to the blob */ /* Check for Target Information block */ - if ((*((long *)&buf2[0x14]) & 0x00800000) == 0x00800000) + /* The NTLM spec instructs to interpret these 4 consecutive bytes as a + * 32bit long integer. However, no endianness is specified. + * The code here and that found in other NTLM implementations point + * towards the assumption that the byte order on the wire has to + * match the order on the sending and receiving hosts. Probably NTLM has + * been thought to be always running on x86_64/i386 machine thus + * implying Little-Endian everywhere. + * + * This said, in case of future changes, we should keep in mind that the + * byte order on the wire for the NTLM header is LE. + */ + const size_t hoff = 0x14; + unsigned long flags = buf2[hoff] | (buf2[hoff + 1] << 8) | + (buf2[hoff + 2] << 16) | (buf2[hoff + 3] << 24); + if ((flags & 0x00800000) == 0x00800000) { tib_len = buf2[0x28]; /* Get Target Information block size */ if (tib_len > 96)