1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Format http-ntlm.c in an ansi2knr-friendly fashion.

This commit is contained in:
hniksic 2005-04-22 17:11:30 -07:00
parent add6c24a19
commit 05aed0cca2
2 changed files with 21 additions and 13 deletions

View File

@ -1,3 +1,8 @@
2005-04-23 Hrvoje Niksic <hniksic@xemacs.org>
* http-ntlm.c: Format the function definitions in an
ansi2knr-friendly fashion.
2005-04-22 Hrvoje Niksic <hniksic@xemacs.org> 2005-04-22 Hrvoje Niksic <hniksic@xemacs.org>
* http.c (gethttp): Handle multiple WWW-Authentication headers, * http.c (gethttp): Handle multiple WWW-Authentication headers,

View File

@ -71,7 +71,7 @@ so, delete this exception statement from your version. */
#endif #endif
/* Define this to make the type-3 message include the NT response message */ /* Define this to make the type-3 message include the NT response message */
#undef USE_NTRESPONSES #define USE_NTRESPONSES 1
/* Flag bits definitions available at on /* Flag bits definitions available at on
http://davenport.sourceforge.net/ntlm.html */ http://davenport.sourceforge.net/ntlm.html */
@ -120,7 +120,8 @@ so, delete this exception statement from your version. */
*/ */
/* return 1 on success, 0 otherwise */ /* 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)) if (0 != strncmp (header, "NTLM", 4))
return 0; return 0;
@ -180,8 +181,9 @@ int ntlm_input (struct ntlmdata *ntlm, const char *header)
* Turns a 56 bit key into the 64 bit, odd parity key and sets the key. The * Turns a 56 bit key into the 64 bit, odd parity key and sets the key. The
* key schedule ks is also set. * key schedule ks is also set.
*/ */
static void setup_des_key(unsigned char *key_56, static void
DES_key_schedule DESKEYARG(ks)) setup_des_key(unsigned char *key_56,
DES_key_schedule DESKEYARG(ks))
{ {
DES_cblock key; DES_cblock key;
@ -203,9 +205,8 @@ static void setup_des_key(unsigned char *key_56,
* 8 byte plaintext is encrypted with each key and the resulting 24 * 8 byte plaintext is encrypted with each key and the resulting 24
* bytes are stored in the results array. * bytes are stored in the results array.
*/ */
static void calc_resp(unsigned char *keys, static void
unsigned char *plaintext, calc_resp(unsigned char *keys, unsigned char *plaintext, unsigned char *results)
unsigned char *results)
{ {
DES_key_schedule ks; DES_key_schedule ks;
@ -225,11 +226,12 @@ static void calc_resp(unsigned char *keys,
/* /*
* Set up lanmanager and nt hashed passwords * Set up lanmanager and nt hashed passwords
*/ */
static void mkhash(const char *password, static void
unsigned char *nonce, /* 8 bytes */ mkhash(const char *password,
unsigned char *lmresp /* must fit 0x18 bytes */ unsigned char *nonce, /* 8 bytes */
unsigned char *lmresp /* must fit 0x18 bytes */
#ifdef USE_NTRESPONSES #ifdef USE_NTRESPONSES
, unsigned char *ntresp /* must fit 0x18 bytes */ , unsigned char *ntresp /* must fit 0x18 bytes */
#endif #endif
) )
{ {
@ -301,8 +303,9 @@ static void mkhash(const char *password,
(((x) >>16)&0xff), ((x)>>24) (((x) >>16)&0xff), ((x)>>24)
/* this is for creating ntlm header output */ /* this is for creating ntlm header output */
char *ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd, char *
int *ready) ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
int *ready)
{ {
const char *domain=""; /* empty */ const char *domain=""; /* empty */
const char *host=""; /* empty */ const char *host=""; /* empty */