--------------------- PatchSet 3795 Date: 2002/04/01 11:16:53 Author: hno Branch: ntlm_smbpasswd Tag: (none) Log: Minor debugging updates Members: src/auth/ntlm/helpers/smbpasswd/ntlm.c:1.1.2.4->1.1.2.5 src/auth/ntlm/helpers/smbpasswd/ntlm.h:1.1.2.2->1.1.2.3 src/auth/ntlm/helpers/smbpasswd/ntlm_smbpasswd.c:1.1.2.5->1.1.2.6 Index: squid/src/auth/ntlm/helpers/smbpasswd/ntlm.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/smbpasswd/Attic/ntlm.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/src/auth/ntlm/helpers/smbpasswd/ntlm.c 26 Feb 2002 09:48:58 -0000 1.1.2.4 +++ squid/src/auth/ntlm/helpers/smbpasswd/ntlm.c 1 Apr 2002 11:16:53 -0000 1.1.2.5 @@ -46,7 +46,7 @@ memcpy(chal->hdr.signature, "NTLMSSP", 8); chal->flags = WSWAP(0x00018206); chal->hdr.type = WSWAP(NTLMSSP_CHALLENGE); - chal->unknown[6] = SSWAP(0x003a); + //chal->unknown[6] = SSWAP(0x003a); d = (char *) chal + 48; i = 0; Index: squid/src/auth/ntlm/helpers/smbpasswd/ntlm.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/smbpasswd/Attic/ntlm.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/src/auth/ntlm/helpers/smbpasswd/ntlm.h 26 Feb 2002 09:48:58 -0000 1.1.2.2 +++ squid/src/auth/ntlm/helpers/smbpasswd/ntlm.h 1 Apr 2002 11:16:53 -0000 1.1.2.3 @@ -1,5 +1,5 @@ /* - * $Id: ntlm.h,v 1.1.2.2 2002/02/26 09:48:58 hno Exp $ + * $Id: ntlm.h,v 1.1.2.3 2002/04/01 11:16:53 hno Exp $ * * AUTHOR: Andrew Doran * @@ -109,7 +109,8 @@ strhdr target; /* Authentication target (domain/server ...) */ int32_t flags; /* Request flags */ u_char challenge[8]; /* Challenge string */ - int16_t unknown[8]; /* Some sort of context data */ + int16_t unknown1[4]; /* Some sort of context data */ + strhdr unknown2; /* Some sort of context string data */ char pad[256]; /* String data */ } ntlm_challenge; Index: squid/src/auth/ntlm/helpers/smbpasswd/ntlm_smbpasswd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/smbpasswd/Attic/ntlm_smbpasswd.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/src/auth/ntlm/helpers/smbpasswd/ntlm_smbpasswd.c 26 Feb 2002 09:48:58 -0000 1.1.2.5 +++ squid/src/auth/ntlm/helpers/smbpasswd/ntlm_smbpasswd.c 1 Apr 2002 11:16:53 -0000 1.1.2.6 @@ -82,6 +82,12 @@ while (fgets(buf, 8192, stdin) != NULL) { if ((p = strchr(buf, '\n')) != NULL) *p = '\0'; /* strip \n */ +#ifdef DEBUG + { + char *p2 = base64_decode("AAA"); + memset(p2, '!', 4096); + } +#endif DEBUG("%s\n", buf); if (strncasecmp(buf, "YR ", 3) == 0) { ntlm_negotiate *nego = (ntlm_negotiate *) base64_decode(buf + 3);