oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

try to use the right domain/hostname offset/ucs2 encoding

Browse Source 
reported by Joe Mason
This commit is contained in:
Love Hörnquist Åstrand
2013-11-17 17:43:47 +01:00
parent 3af1b3a8a6
commit 576f103203
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/ntlm/ntlm.c
View File

@@ -670,6 +670,7 @@ heim_ntlm_decode_type1(const struct ntlm_buf *buf, struct ntlm_type1 *data)
uint32_t type; uint32_t type;
struct sec_buffer domain, hostname; struct sec_buffer domain, hostname;
krb5_storage *in; krb5_storage *in;
int ucs2;
memset(data, 0, sizeof(*data)); memset(data, 0, sizeof(*data));
@@ -685,20 +686,25 @@ heim_ntlm_decode_type1(const struct ntlm_buf *buf, struct ntlm_type1 *data)
CHECK(krb5_ret_uint32(in, &type), 0); CHECK(krb5_ret_uint32(in, &type), 0);
CHECK(type, 1); CHECK(type, 1);
CHECK(krb5_ret_uint32(in, &data->flags), 0); CHECK(krb5_ret_uint32(in, &data->flags), 0);
if (data->flags & NTLM_OEM_SUPPLIED_DOMAIN)
CHECK(ret_sec_buffer(in, &domain), 0); ucs2 = !!(data->flags & NTLM_NEG_UNICODE);
if (data->flags & NTLM_OEM_SUPPLIED_WORKSTATION)
CHECK(ret_sec_buffer(in, &hostname), 0); /*
#if 0 * domain and hostname are unconditionally encoded regardless of
if (domain.offset > 32) { * NTLMSSP_NEGOTIATE_OEM_{HOSTNAME,WORKSTATION}_SUPPLIED flag
*/
CHECK(ret_sec_buffer(in, &domain), 0);
CHECK(ret_sec_buffer(in, &hostname), 0);
if (data->flags & NTLM_NEG_VERSION) {
CHECK(krb5_ret_uint32(in, &data->os[0]), 0); CHECK(krb5_ret_uint32(in, &data->os[0]), 0);
CHECK(krb5_ret_uint32(in, &data->os[1]), 0); CHECK(krb5_ret_uint32(in, &data->os[1]), 0);
} }
#endif
if (data->flags & NTLM_OEM_SUPPLIED_DOMAIN) if (data->flags & NTLM_OEM_SUPPLIED_DOMAIN)
CHECK(ret_sec_string(in, 0, &domain, &data->domain), 0); CHECK(ret_sec_string(in, ucs2, &domain, &data->domain), 0);
if (data->flags & NTLM_OEM_SUPPLIED_WORKSTATION) if (data->flags & NTLM_OEM_SUPPLIED_WORKSTATION)
CHECK(ret_sec_string(in, 0, &hostname, &data->hostname), 0); CHECK(ret_sec_string(in, ucs2, &hostname, &data->hostname), 0);
out: out:
if (in) if (in)
@@ -748,20 +754,22 @@ heim_ntlm_encode_type1(const struct ntlm_type1 *type1, struct ntlm_buf *data)
if (flags & NTLM_NEG_VERSION) if (flags & NTLM_NEG_VERSION)
base += SIZE_OS_VERSION; /* os */ base += SIZE_OS_VERSION; /* os */
domain.offset = base;
if (type1->domain) { if (type1->domain) {
domain.offset = base;
domain.length = len_string(ucs2, type1->domain); domain.length = len_string(ucs2, type1->domain);
domain.allocated = domain.length; domain.allocated = domain.length;
} else { } else {
domain.offset = 0;
domain.length = 0; domain.length = 0;
domain.allocated = 0; domain.allocated = 0;
} }
hostname.offset = domain.allocated + domain.offset;
if (type1->hostname) { if (type1->hostname) {
hostname.offset = domain.allocated + domain.offset;
hostname.length = len_string(ucs2, type1->hostname); hostname.length = len_string(ucs2, type1->hostname);
hostname.allocated = hostname.length; hostname.allocated = hostname.length;
} else { } else {
hostname.offset = 0;
hostname.length = 0; hostname.length = 0;
hostname.allocated = 0; hostname.allocated = 0;
} }
@@ -778,6 +786,7 @@ heim_ntlm_encode_type1(const struct ntlm_type1 *type1, struct ntlm_buf *data)
CHECK(store_sec_buffer(out, &domain), 0); CHECK(store_sec_buffer(out, &domain), 0);
CHECK(store_sec_buffer(out, &hostname), 0); CHECK(store_sec_buffer(out, &hostname), 0);
if (flags & NTLM_NEG_VERSION) { if (flags & NTLM_NEG_VERSION) {
CHECK(encode_os_version(out), 0); CHECK(encode_os_version(out), 0);
} }