Merging Ted Mielczarek's CSS changes with tip.

[wget] / src / http-ntlm.c

diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 976498a3f13e96e894ddd11e5acc9e4a6fc48e1c..def832be9bc6975b9e73f4bc85237c5924dce8fb 100644 (file)
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -1,5 +1,5 @@
 /* NTLM code.
 /* NTLM code.

-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.
    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.


@@ -28,7 +28,7 @@ Corresponding Source for a non-source form of such a combination
 shall include the source code for the parts of OpenSSL used as well
 as that of the covered work.  */
 
 shall include the source code for the parts of OpenSSL used as well
 as that of the covered work.  */
 

-#include <config.h>
+#include "wget.h"

 
 /* NTLM details:
    
 
 /* NTLM details:
    


@@ -43,8 +43,8 @@ as that of the covered work.  */
 
 #include <openssl/des.h>
 #include <openssl/md4.h>
 
 #include <openssl/des.h>
 #include <openssl/md4.h>

+#include <openssl/opensslv.h>

 
 

-#include "wget.h"

 #include "utils.h"
 #include "http-ntlm.h"
 
 #include "utils.h"
 #include "http-ntlm.h"
 


@@ -121,7 +121,7 @@ ntlm_input (struct ntlmdata *ntlm, const char *header)
     return false;
 
   header += 4;
     return false;
 
   header += 4;

-  while (*header && ISSPACE(*header))
+  while (*header && c_isspace(*header))

     header++;
 
   if (*header)
     header++;
 
   if (*header)


@@ -247,7 +247,7 @@ mkhash(const char *password,
     len = 14;
   
   for (i=0; i<len; i++)
     len = 14;
   
   for (i=0; i<len; i++)

-    pw[i] = TOUPPER (password[i]);
+    pw[i] = c_toupper (password[i]);

 
   for (; i<14; i++)
     pw[i] = 0;
 
   for (; i<14; i++)
     pw[i] = 0;