On Wednesday 30 October 2013 17:06:09 Kamil Dudka wrote: > On Wednesday 30 October 2013 16:14:54 Kamil Dudka wrote: > > On Wednesday 30 October 2013 09:58:36 Daniel Stenberg wrote: > > > On Wed, 30 Oct 2013, Steve Holme wrote: > > > > I've just pushed commit e17c1b25bc33eb. > > > > > > > > I will an eye out on the auto builds to see if anything is flagged > > > > but any comments or feedback is much appreciated. > > > > > > It immediately made test 67 fail for me. It seems our NTLM code is > > > passing in the basee64 string _with_ the trailing CRLF at the end (sent > > > to the Curl_ntlm_decode_type2_message() function) so the length isn't > > > an even 4 bytes. In the test case the string is in fact 218 bytes as > > > the last two aren't part of the base64... > > > > The following patch fixes the problem for me. > > Oops, my previous patch did not handle the CR character, so NTLM was still > broken. The attached patch should fix it!
One more follow-up attached. > > Kamil
From 703b344469f2cad4130b812b53e3ed0db815a6ec Mon Sep 17 00:00:00 2001 From: Kamil Dudka <[email protected]> Date: Wed, 30 Oct 2013 17:52:19 +0100 Subject: [PATCH] tests: use proper padding in NTLM responses --- tests/data/test868 | 2 +- tests/data/test906 | 2 +- tests/data/test921 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/test868 b/tests/data/test868 index a2d09d0..3da3b37 100644 --- a/tests/data/test868 +++ b/tests/data/test868 @@ -14,7 +14,7 @@ RFC5034 <servercmd> AUTH NTLM REPLY AUTH + -REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA +REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAABoKBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyY3VybGhvc3Q= +OK Login successful </servercmd> <data> diff --git a/tests/data/test906 b/tests/data/test906 index 4b0f2a8..14de3a6 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -13,7 +13,7 @@ RFC4954 <servercmd> AUTH NTLM REPLY AUTH 334 NTLM supported -REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 334 TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA +REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 334 TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAABoKBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyY3VybGhvc3Q= 235 Authenticated </servercmd> </reply> diff --git a/tests/data/test921 b/tests/data/test921 index d69f083..1a2d43e 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -12,7 +12,7 @@ RFC4954 <reply> <servercmd> AUTH NTLM -REPLY AUTH 334 TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA +REPLY AUTH 334 TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAABoKBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyY3VybGhvc3Q= 235 Authenticated </servercmd> </reply> -- 1.7.1
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
