#endif
/* Define this to make the type-3 message include the NT response message */
-#undef USE_NTRESPONSES
+#define USE_NTRESPONSES 1
\f
/* Flag bits definitions available at on
http://davenport.sourceforge.net/ntlm.html */
*/
/* return 1 on success, 0 otherwise */
-int ntlm_input (struct ntlmdata *ntlm, const char *header)
+int
+ntlm_input (struct ntlmdata *ntlm, const char *header)
{
if (0 != strncmp (header, "NTLM", 4))
return 0;
32 (48) start of data block
*/
int size;
- unsigned char *buffer = (unsigned char *) alloca (strlen (header));
+ char *buffer = (char *) alloca (strlen (header));
+
+ DEBUGP (("Received a type-2 NTLM message.\n"));
size = base64_decode (header, buffer);
if (size < 0)
else
{
if (ntlm->state >= NTLMSTATE_TYPE1)
- return 0; /* this is an error */
+ {
+ DEBUGP (("Unexpected empty NTLM message.\n"));
+ return 0; /* this is an error */
+ }
+ DEBUGP (("Empty NTLM message, starting transaction.\n"));
ntlm->state = NTLMSTATE_TYPE1; /* we should sent away a type-1 */
}
* Turns a 56 bit key into the 64 bit, odd parity key and sets the key. The
* key schedule ks is also set.
*/
-static void setup_des_key(unsigned char *key_56,
- DES_key_schedule DESKEYARG(ks))
+static void
+setup_des_key(unsigned char *key_56,
+ DES_key_schedule DESKEYARG(ks))
{
DES_cblock key;
* 8 byte plaintext is encrypted with each key and the resulting 24
* bytes are stored in the results array.
*/
-static void calc_resp(unsigned char *keys,
- unsigned char *plaintext,
- unsigned char *results)
+static void
+calc_resp(unsigned char *keys, unsigned char *plaintext, unsigned char *results)
{
DES_key_schedule ks;
/*
* Set up lanmanager and nt hashed passwords
*/
-static void mkhash(const char *password,
- unsigned char *nonce, /* 8 bytes */
- unsigned char *lmresp /* must fit 0x18 bytes */
+static void
+mkhash(const char *password,
+ unsigned char *nonce, /* 8 bytes */
+ unsigned char *lmresp /* must fit 0x18 bytes */
#ifdef USE_NTRESPONSES
- , unsigned char *ntresp /* must fit 0x18 bytes */
+ , unsigned char *ntresp /* must fit 0x18 bytes */
#endif
)
{
(((x) >>16)&0xff), ((x)>>24)
/* this is for creating ntlm header output */
-char *ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
- int *ready)
+char *
+ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
+ int *ready)
{
const char *domain=""; /* empty */
const char *host=""; /* empty */
int domoff; /* domain name offset */
int size;
char *base64;
- unsigned char ntlmbuf[256]; /* enough, unless the host/domain is very long */
+ char ntlmbuf[256]; /* enough, unless the host/domain is very long */
/* point to the address of the pointer that holds the string to sent to the
server, which is for a plain host or for a HTTP proxy */
default: /* for the weird cases we (re)start here */
hostoff = 32;
domoff = hostoff + hostlen;
+
+ DEBUGP (("Creating a type-1 NTLM message.\n"));
/* Create and send a type-1 message:
24 Supplied Workstation security buffer(*)
32 start of data block
+ Format string (merged for pre-ANSI compilers):
+ "NTLMSSP%c"
+ "\x01%c%c%c" 32-bit type = 1
+ "%c%c%c%c" 32-bit NTLM flag field
+ "%c%c" domain length
+ "%c%c" domain allocated space
+ "%c%c" domain name offset
+ "%c%c" 2 zeroes
+ "%c%c" host length
+ "%c%c" host allocated space
+ "%c%c" host name offset
+ "%c%c" 2 zeroes
+ "%s" host name
+ "%s" domain string
*/
- snprintf((char *)ntlmbuf, sizeof(ntlmbuf), "NTLMSSP%c"
- "\x01%c%c%c" /* 32-bit type = 1 */
- "%c%c%c%c" /* 32-bit NTLM flag field */
- "%c%c" /* domain length */
- "%c%c" /* domain allocated space */
- "%c%c" /* domain name offset */
- "%c%c" /* 2 zeroes */
- "%c%c" /* host length */
- "%c%c" /* host allocated space */
- "%c%c" /* host name offset */
- "%c%c" /* 2 zeroes */
- "%s" /* host name */
- "%s", /* domain string */
+ snprintf(ntlmbuf, sizeof(ntlmbuf),
+ "NTLMSSP%c\001%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s",
0, /* trailing zero */
0,0,0, /* part of type-1 long */
size = 32 + hostlen + domlen;
base64 = (char *) alloca (BASE64_LENGTH (size) + 1);
- base64_encode (ntlmbuf, base64, size);
+ base64_encode (ntlmbuf, size, base64);
output = concat_strings ("NTLM ", base64, (char *) 0);
break;
const char *usr;
int userlen;
+ DEBUGP (("Creating a type-3 NTLM message.\n"));
+
usr = strchr(user, '\\');
if(!usr)
usr = strchr(user, '/');
if (usr) {
- domain = usr;
+ domain = user;
domlen = usr - domain;
usr++;
}
lmrespoff = hostoff + hostlen;
ntrespoff = lmrespoff + 0x18;
- /* Create the big type-3 message binary blob */
- size = snprintf((char *)ntlmbuf, sizeof(ntlmbuf),
- "NTLMSSP%c"
- "\x03%c%c%c" /* type-3, 32 bits */
+ /* Create the big type-3 message binary blob:
+ "NTLMSSP%c"
+ "\x03%c%c%c" type-3, 32 bits
- "%c%c%c%c" /* LanManager length + allocated space */
- "%c%c" /* LanManager offset */
- "%c%c" /* 2 zeroes */
+ "%c%c%c%c" LanManager length + allocated space
+ "%c%c" LanManager offset
+ "%c%c" 2 zeroes
- "%c%c" /* NT-response length */
- "%c%c" /* NT-response allocated space */
- "%c%c" /* NT-response offset */
- "%c%c" /* 2 zeroes */
-
- "%c%c" /* domain length */
- "%c%c" /* domain allocated space */
- "%c%c" /* domain name offset */
- "%c%c" /* 2 zeroes */
-
- "%c%c" /* user length */
- "%c%c" /* user allocated space */
- "%c%c" /* user offset */
- "%c%c" /* 2 zeroes */
-
- "%c%c" /* host length */
- "%c%c" /* host allocated space */
- "%c%c" /* host offset */
- "%c%c%c%c%c%c" /* 6 zeroes */
-
- "\xff\xff" /* message length */
- "%c%c" /* 2 zeroes */
-
- "\x01\x82" /* flags */
- "%c%c" /* 2 zeroes */
-
- /* domain string */
- /* user string */
- /* host string */
- /* LanManager response */
- /* NT response */
- ,
+ "%c%c" NT-response length
+ "%c%c" NT-response allocated space
+ "%c%c" NT-response offset
+ "%c%c" 2 zeroes
+
+ "%c%c" domain length
+ "%c%c" domain allocated space
+ "%c%c" domain name offset
+ "%c%c" 2 zeroes
+
+ "%c%c" user length
+ "%c%c" user allocated space
+ "%c%c" user offset
+ "%c%c" 2 zeroes
+
+ "%c%c" host length
+ "%c%c" host allocated space
+ "%c%c" host offset
+ "%c%c%c%c%c%c" 6 zeroes
+
+ "\xff\xff" message length
+ "%c%c" 2 zeroes
+
+ "\x01\x82" flags
+ "%c%c" 2 zeroes */
+
+ size = snprintf(ntlmbuf, sizeof(ntlmbuf),
+ "NTLMSSP%c\003%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\377\377%c%c\001\202%c%c",
0, /* zero termination */
0,0,0, /* type-3 long, the 24 upper bits */
/* convert the binary blob into base64 */
base64 = (char *) alloca (BASE64_LENGTH (size) + 1);
- base64_encode (ntlmbuf, base64, size);
+ base64_encode (ntlmbuf, size, base64);
output = concat_strings ("NTLM ", base64, (char *) 0);
projects / wget / blobdiff