Hi,

On 10-07-17 06:34, Antonio Quartulli wrote:
> 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 <a...@unstable.cc>
> ---
>  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 bb929283..f18e0371 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);
> 

ACK

(Though this patch no longer applies cleanly if you change the
gen_md4_hash() data type to void*, but that is trivially fixed.)

-Steffan

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to