comparison libpurple/ntlm.c @ 19781:6dcab2412c22

This is parts 1 and 2 of patch #2910 from Vladimir (thecrux) to improve NTLM proxy handling. Specifically, it specifies that we're using Unicode strings and uses the hostname of the local machine instead of incorrectly using the proxy server's hostname for authentication. References #2910.

19780:3023e0ba2fa6

	tmsg->protocol[4] = 'S';
	tmsg->protocol[5] = 'S';
	tmsg->protocol[6] = 'P';
	tmsg->protocol[7] = '\0';
	tmsg->type      = 0x00000001;
	tmsg->flags     = 0x0000b202;
	tmsg->dom_len1  = tmsg->dom_len2 = domainlen;
	tmsg->dom_off   = sizeof(struct type1_message) + hostnamelen;
	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
	tmsg->host_off  = sizeof(struct type1_message);
	memcpy(msg + tmsg->host_off, hostname, hostnamelen);

	if(flags) {
		tmsg->sess_off = sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18 + 0x18;
		tmsg->sess_len1 = tmsg->sess_len2 = 0x0010;
	}

	tmsg->flags = 0x00008200;

	tmp = (char *)tmsg + sizeof(struct type3_message);

	ucs2le = g_convert(domain, -1, "UCS-2LE", "UTF-8", NULL, NULL, NULL);
	memcpy(tmp, ucs2le, domainlen);

19781:6dcab2412c22

	tmsg->protocol[4] = 'S';
	tmsg->protocol[5] = 'S';
	tmsg->protocol[6] = 'P';
	tmsg->protocol[7] = '\0';
	tmsg->type      = 0x00000001;
	tmsg->flags     = 0x0000b203;
	tmsg->dom_len1  = tmsg->dom_len2 = domainlen;
	tmsg->dom_off   = sizeof(struct type1_message) + hostnamelen;
	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
	tmsg->host_off  = sizeof(struct type1_message);
	memcpy(msg + tmsg->host_off, hostname, hostnamelen);

	if(flags) {
		tmsg->sess_off = sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18 + 0x18;
		tmsg->sess_len1 = tmsg->sess_len2 = 0x0010;
	}

	tmsg->flags = 0x00008201;

	tmp = (char *)tmsg + sizeof(struct type3_message);

	ucs2le = g_convert(domain, -1, "UCS-2LE", "UTF-8", NULL, NULL, NULL);
	memcpy(tmp, ucs2le, domainlen);