bump libheimntlm to the version from OSX 10.9 Mavericks
This commit is contained in:
Love Hörnquist Åstrand
@@ -41,6 +41,8 @@
|
||||
#include <krb5-types.h> /* or <inttypes.h> */
|
||||
#include <heimntlm.h>
|
||||
|
||||
#ifdef ENABLE_NTLM
|
||||
|
||||
static int
|
||||
test_parse(void)
|
||||
{
|
||||
@@ -56,7 +58,7 @@ test_parse(void)
|
||||
|
||||
memset(&type1, 0, sizeof(type1));
|
||||
|
||||
type1.flags = NTLM_NEG_UNICODE|NTLM_NEG_TARGET|NTLM_NEG_NTLM;
|
||||
type1.flags = NTLM_NEG_UNICODE|NTLM_NEG_TARGET|NTLM_NEG_NTLM|NTLM_NEG_VERSION;
|
||||
type1.domain = rk_UNCONST(domain);
|
||||
type1.hostname = NULL;
|
||||
type1.os[0] = 0;
|
||||
@@ -123,7 +125,7 @@ test_parse(void)
|
||||
free(key.data);
|
||||
}
|
||||
|
||||
ret = heim_ntlm_encode_type3(&type3, &data);
|
||||
ret = heim_ntlm_encode_type3(&type3, &data, NULL);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_encode_type3");
|
||||
|
||||
@@ -288,18 +290,107 @@ test_ntlm2_session_resp(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_ntlmv2(void)
|
||||
{
|
||||
unsigned char type3[413] =
|
||||
"\x4e\x54\x4c\x4d\x53\x53\x50\x00\x03\x00\x00\x00\x18\x00\x18\x00"
|
||||
"\x80\x00\x00\x00\x9e\x00\x9e\x00\x98\x00\x00\x00\x14\x00\x14\x00"
|
||||
"\x48\x00\x00\x00\x10\x00\x10\x00\x5c\x00\x00\x00\x14\x00\x14\x00"
|
||||
"\x6c\x00\x00\x00\x00\x00\x00\x00\x36\x01\x00\x00\x05\x82\x88\xa2"
|
||||
"\x05\x01\x28\x0a\x00\x00\x00\x0f\x43\x00\x4f\x00\x4c\x00\x4c\x00"
|
||||
"\x45\x00\x59\x00\x2d\x00\x58\x00\x50\x00\x34\x00\x54\x00\x45\x00"
|
||||
"\x53\x00\x54\x00\x55\x00\x53\x00\x45\x00\x52\x00\x43\x00\x4f\x00"
|
||||
"\x4c\x00\x4c\x00\x45\x00\x59\x00\x2d\x00\x58\x00\x50\x00\x34\x00"
|
||||
"\x2f\x96\xec\x0a\xf7\x9f\x2e\x24\xba\x09\x48\x10\xa5\x22\xd4\xe1"
|
||||
"\x16\x6a\xca\x58\x74\x9a\xc1\x4f\x54\x6f\xee\x40\x96\xce\x43\x6e"
|
||||
"\xdf\x99\x20\x71\x6c\x9a\xda\x2a\x01\x01\x00\x00\x00\x00\x00\x00"
|
||||
"\x8d\xc0\x57\xc9\x79\x5e\xcb\x01\x16\x6a\xca\x58\x74\x9a\xc1\x4f"
|
||||
"\x00\x00\x00\x00\x02\x00\x14\x00\x4e\x00\x55\x00\x54\x00\x43\x00"
|
||||
"\x52\x00\x41\x00\x43\x00\x4b\x00\x45\x00\x52\x00\x01\x00\x14\x00"
|
||||
"\x4e\x00\x55\x00\x54\x00\x43\x00\x52\x00\x41\x00\x43\x00\x4b\x00"
|
||||
"\x45\x00\x52\x00\x04\x00\x12\x00\x61\x00\x70\x00\x70\x00\x6c\x00"
|
||||
"\x65\x00\x2e\x00\x63\x00\x6f\x00\x6d\x00\x03\x00\x20\x00\x68\x00"
|
||||
"\x75\x00\x6d\x00\x6d\x00\x65\x00\x6c\x00\x2e\x00\x61\x00\x70\x00"
|
||||
"\x70\x00\x6c\x00\x65\x00\x2e\x00\x63\x00\x6f\x00\x6d\x00\x00\x00"
|
||||
"\x00\x00\x00\x00\x00\x00\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f"
|
||||
"\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32\x00\x20"
|
||||
"\x00\x53\x00\x65\x00\x72\x00\x76\x00\x69\x00\x63\x00\x65\x00\x20"
|
||||
"\x00\x50\x00\x61\x00\x63\x00\x6b\x00\x20\x00\x33\x00\x20\x00\x32"
|
||||
"\x00\x36\x00\x30\x00\x30\x00\x00\x00\x57\x00\x69\x00\x6e\x00\x64"
|
||||
"\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32"
|
||||
"\x00\x20\x00\x35\x00\x2e\x00\x31\x00\x00\x00\x00\x00";
|
||||
const unsigned char challenge[8] =
|
||||
"\xe4\x9c\x6a\x12\xe1\xbd\xde\x6a";
|
||||
unsigned char sessionkey[16];
|
||||
|
||||
const char key[16] = "\xD1\x83\x98\x3E\xAE\xA7\xBE\x99\x59\xC8\xF4\xC1\x98\xED\x0E\x68";
|
||||
|
||||
struct ntlm_buf data;
|
||||
struct ntlm_type3 t3;
|
||||
int ret;
|
||||
|
||||
struct ntlm_targetinfo ti;
|
||||
|
||||
unsigned char timsg[114] =
|
||||
"\002\000\024\000N\000U\000T\000C\000R\000A\000C\000K\000E\000R\000\001\000\024\000N\000U\000T\000C\000R\000A\000C\000K\000E\000R\000\004\000\022\000a\000p\000p\000l\000e\000.\000c\000o\000m\000\003\000 \000h\000u\000m\000m\000e\000l\000.\000a\000p\000p\000l\000e\000.\000c\000o\000m\000\000\000\000\000\000\000\000";
|
||||
|
||||
|
||||
data.data = type3;
|
||||
data.length = sizeof(type3);
|
||||
|
||||
ret = heim_ntlm_decode_type3(&data, 1, &t3);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_decode_type3");
|
||||
|
||||
memset(&ti, 0, sizeof(ti));
|
||||
|
||||
data.data = timsg;
|
||||
data.length = sizeof(timsg);
|
||||
|
||||
ret = heim_ntlm_decode_targetinfo(&data, 1, &ti);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = heim_ntlm_verify_ntlm2(key, sizeof(key),
|
||||
t3.username,
|
||||
t3.targetname,
|
||||
1285615547,
|
||||
challenge,
|
||||
&t3.ntlm,
|
||||
&data,
|
||||
sessionkey);
|
||||
if (ret)
|
||||
errx(1, "verify_ntlmv2");
|
||||
|
||||
if (sizeof(timsg) != data.length || memcmp(timsg, data.data, sizeof(timsg)) != 0)
|
||||
errx(1, "target info wrong: %d != %d",
|
||||
(int)sizeof(timsg), (int)data.length);
|
||||
|
||||
heim_ntlm_free_type3(&t3);
|
||||
heim_ntlm_free_targetinfo(&ti);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_targetinfo(void)
|
||||
{
|
||||
struct ntlm_targetinfo ti;
|
||||
struct ntlm_buf buf;
|
||||
const char *dnsservername = "dnsservername";
|
||||
const char *targetname = "targetname";
|
||||
const char z16[16] = { 0 };
|
||||
int ret;
|
||||
|
||||
memset(&ti, 0, sizeof(ti));
|
||||
|
||||
ti.dnsservername = rk_UNCONST(dnsservername);
|
||||
ti.avflags = 1;
|
||||
ti.targetname = rk_UNCONST(targetname);
|
||||
ti.channel_bindings.data = rk_UNCONST(z16);
|
||||
ti.channel_bindings.length = sizeof(z16);
|
||||
|
||||
ret = heim_ntlm_encode_targetinfo(&ti, 1, &buf);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -315,12 +406,134 @@ test_targetinfo(void)
|
||||
errx(1, "ti.dnshostname != %s", dnsservername);
|
||||
if (ti.avflags != 1)
|
||||
errx(1, "ti.avflags != 1");
|
||||
if (ti.targetname == NULL ||
|
||||
strcmp(ti.targetname, targetname) != 0)
|
||||
errx(1, "ti.targetname != %s", targetname);
|
||||
|
||||
if (ti.channel_bindings.length != sizeof(z16) ||
|
||||
memcmp(ti.channel_bindings.data, z16, sizeof(z16)) != 0)
|
||||
errx(1, "ti.channel_bindings != Z(16)");
|
||||
|
||||
heim_ntlm_free_targetinfo(&ti);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_string2key(void)
|
||||
{
|
||||
const char *pw = "山田";
|
||||
struct ntlm_buf buf;
|
||||
|
||||
unsigned char key[16] = {
|
||||
0xc6, 0x5d, 0xc7, 0x61, 0xa1, 0x34, 0x17, 0xa1,
|
||||
0x17, 0x08, 0x9c, 0x1b, 0xb0, 0x0d, 0x0f, 0x19
|
||||
};
|
||||
|
||||
if (heim_ntlm_nt_key(pw, &buf) != 0)
|
||||
errx(1, "heim_ntlmv_nt_key(jp)");
|
||||
|
||||
if (buf.length != 16 || memcmp(buf.data, key, 16) != 0)
|
||||
errx(1, "compare failed");
|
||||
|
||||
heim_ntlm_free_buf(&buf);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_jp(void)
|
||||
{
|
||||
char buf2[220] =
|
||||
"\x4e\x54\x4c\x4d\x53\x53\x50\x00\x02\x00\x00\x00\x06\x00\x06\x00"
|
||||
"\x38\x00\x00\x00\x05\x02\x89\x62\x62\x94\xb1\xf3\x56\x80\xb0\xf9"
|
||||
"\x00\x00\x00\x00\x00\x00\x00\x00\x9e\x00\x9e\x00\x3e\x00\x00\x00"
|
||||
"\x06\x01\xb0\x1d\x00\x00\x00\x0f\x43\x00\x4f\x00\x53\x00\x02\x00"
|
||||
"\x06\x00\x43\x00\x4f\x00\x53\x00\x01\x00\x12\x00\x43\x00\x4f\x00"
|
||||
"\x53\x00\x57\x00\x49\x00\x4e\x00\x37\x00\x4a\x00\x50\x00\x04\x00"
|
||||
"\x1a\x00\x63\x00\x6f\x00\x73\x00\x2e\x00\x61\x00\x70\x00\x70\x00"
|
||||
"\x6c\x00\x65\x00\x2e\x00\x63\x00\x6f\x00\x6d\x00\x03\x00\x2e\x00"
|
||||
"\x63\x00\x6f\x00\x73\x00\x77\x00\x69\x00\x6e\x00\x37\x00\x6a\x00"
|
||||
"\x70\x00\x2e\x00\x63\x00\x6f\x00\x73\x00\x2e\x00\x61\x00\x70\x00"
|
||||
"\x70\x00\x6c\x00\x65\x00\x2e\x00\x63\x00\x6f\x00\x6d\x00\x05\x00"
|
||||
"\x1a\x00\x63\x00\x6f\x00\x73\x00\x2e\x00\x61\x00\x70\x00\x70\x00"
|
||||
"\x6c\x00\x65\x00\x2e\x00\x63\x00\x6f\x00\x6d\x00\x07\x00\x08\x00"
|
||||
"\x94\x51\xf0\xbd\xdc\x61\xcb\x01\x00\x00\x00\x00";
|
||||
|
||||
char buf3[362] =
|
||||
"\x4e\x54\x4c\x4d\x53\x53\x50\x00\x03\x00\x00\x00\x18\x00\x18\x00"
|
||||
"\x74\x00\x00\x00\xce\x00\xce\x00\x8c\x00\x00\x00\x1a\x00\x1a\x00"
|
||||
"\x40\x00\x00\x00\x04\x00\x04\x00\x5a\x00\x00\x00\x16\x00\x16\x00"
|
||||
"\x5e\x00\x00\x00\x10\x00\x10\x00\x5a\x01\x00\x00\x05\x02\x89\x62"
|
||||
"\x31\x00\x37\x00\x2e\x00\x32\x00\x30\x00\x31\x00\x2e\x00\x35\x00"
|
||||
"\x37\x00\x2e\x00\x31\x00\x32\x00\x31\x00\x71\x5c\x30\x75\x77\x00"
|
||||
"\x6f\x00\x72\x00\x6b\x00\x73\x00\x74\x00\x61\x00\x74\x00\x69\x00"
|
||||
"\x6f\x00\x6e\x00\xab\xad\xeb\x72\x01\xd4\x5f\xdf\x59\x07\x5f\xa9"
|
||||
"\xfd\x54\x98\x2d\xfa\x17\xbb\xf1\x3c\x8f\xf5\x20\xe6\x8f\xd7\x0a"
|
||||
"\xc9\x19\x3e\x94\x61\x31\xdb\x0f\x55\xe8\xe2\x53\x01\x01\x00\x00"
|
||||
"\x00\x00\x00\x00\x00\x06\x3e\x30\xe4\x61\xcb\x01\x71\x98\x10\x6b"
|
||||
"\x4c\x82\xec\xb3\x00\x00\x00\x00\x02\x00\x06\x00\x43\x00\x4f\x00"
|
||||
"\x53\x00\x01\x00\x12\x00\x43\x00\x4f\x00\x53\x00\x57\x00\x49\x00"
|
||||
"\x4e\x00\x37\x00\x4a\x00\x50\x00\x04\x00\x1a\x00\x63\x00\x6f\x00"
|
||||
"\x73\x00\x2e\x00\x61\x00\x70\x00\x70\x00\x6c\x00\x65\x00\x2e\x00"
|
||||
"\x63\x00\x6f\x00\x6d\x00\x03\x00\x2e\x00\x63\x00\x6f\x00\x73\x00"
|
||||
"\x77\x00\x69\x00\x6e\x00\x37\x00\x6a\x00\x70\x00\x2e\x00\x63\x00"
|
||||
"\x6f\x00\x73\x00\x2e\x00\x61\x00\x70\x00\x70\x00\x6c\x00\x65\x00"
|
||||
"\x2e\x00\x63\x00\x6f\x00\x6d\x00\x05\x00\x1a\x00\x63\x00\x6f\x00"
|
||||
"\x73\x00\x2e\x00\x61\x00\x70\x00\x70\x00\x6c\x00\x65\x00\x2e\x00"
|
||||
"\x63\x00\x6f\x00\x6d\x00\x07\x00\x08\x00\xab\xec\xcc\x30\xe4\x61"
|
||||
"\xcb\x01\x00\x00\x00\x00\x00\x00\x00\x00\xbc\x2e\xba\x3f\xd1\xb1"
|
||||
"\xa7\x70\x00\x9d\x55\xa0\x59\x74\x2b\x78";
|
||||
|
||||
|
||||
struct ntlm_type2 type2;
|
||||
struct ntlm_type3 type3;
|
||||
struct ntlm_buf data;
|
||||
int ret;
|
||||
|
||||
data.length = sizeof(buf2);
|
||||
data.data = buf2;
|
||||
|
||||
memset(&type2, 0, sizeof(type2));
|
||||
|
||||
ret = heim_ntlm_decode_type2(&data, &type2);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_decode_type2(jp): %d", ret);
|
||||
|
||||
data.data = NULL;
|
||||
data.length = 0;
|
||||
|
||||
ret = heim_ntlm_encode_type2(&type2, &data);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_encode_type2(jp): %d", ret);
|
||||
|
||||
heim_ntlm_free_type2(&type2);
|
||||
heim_ntlm_free_buf(&data);
|
||||
|
||||
data.length = sizeof(buf3);
|
||||
data.data = buf3;
|
||||
|
||||
memset(&type3, 0, sizeof(type3));
|
||||
|
||||
ret = heim_ntlm_decode_type3(&data, 1, &type3);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_decode_type2(jp): %d", ret);
|
||||
|
||||
data.data = NULL;
|
||||
data.length = 0;
|
||||
|
||||
ret = heim_ntlm_encode_type3(&type3, &data, NULL);
|
||||
if (ret)
|
||||
errx(1, "heim_ntlm_decode_type2(jp): %d", ret);
|
||||
|
||||
heim_ntlm_free_type3(&type3);
|
||||
heim_ntlm_free_buf(&data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static int verbose_flag = 0;
|
||||
static int version_flag = 0;
|
||||
static int help_flag = 0;
|
||||
@@ -357,17 +570,16 @@ main(int argc, char **argv)
|
||||
exit(0);
|
||||
}
|
||||
|
||||
argc -= optidx;
|
||||
argv += optidx;
|
||||
#ifdef ENABLE_NTLM
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_parse\n");
|
||||
|
||||
ret += test_parse();
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_keys\n");
|
||||
|
||||
ret += test_keys();
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_ntlm2_session_resp\n");
|
||||
ret += test_ntlm2_session_resp();
|
||||
@@ -375,6 +587,19 @@ main(int argc, char **argv)
|
||||
if (verbose_flag)
|
||||
printf("test_targetinfo\n");
|
||||
ret += test_targetinfo();
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_ntlmv2\n");
|
||||
ret += test_ntlmv2();
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_string2key\n");
|
||||
ret += test_string2key();
|
||||
|
||||
if (verbose_flag)
|
||||
printf("test_jp\n");
|
||||
ret += test_jp();
|
||||
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user