From 90f2edcbb7c1e890de96a9a44c87ca58dbd60b96 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 10 Jul 2017 12:34:40 +0800 Subject: [PATCH] ntlm: restyle compressed multiple function calls The gen_md4_hash() function is receiving as first argument a buffer that is filled by a function invoked when evaluating the second argument. Although this is proper C, it makes the call invocation a bit obscure because it is not immediately easy to grasp how the 'pwbuf' buffer is filled. Unroll the multiple function call onto lines and make the core more readable. Signed-off-by: Antonio Quartulli Acked-by: Steffan Karger Message-Id: <20170710043441.24770-4-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15030.html Signed-off-by: David Sommerseth (cherry picked from commit c2d08916f1b7933bec81422d1f14f84e9b1ef878) --- src/openvpn/ntlm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index 393368e41..8c322f74a 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -247,8 +247,8 @@ ntlm_phase_3(const struct http_proxy_info *p, const char *phase_2, struct gc_are /* fill 1st 16 bytes with md4 hash, disregard terminating null */ - gen_md4_hash((uint8_t *)pwbuf, unicodize(pwbuf, p->up.password) - 2, - md4_hash); + int unicode_len = unicodize(pwbuf, p->up.password) - 2; + gen_md4_hash((uint8_t *)pwbuf, unicode_len, md4_hash); /* pad to 21 bytes */ memset(md4_hash + MD4_DIGEST_LENGTH, 0, 5); -- 2.47.2