commit: r1749 - neon/branches/0.29.x/src

[joe at manyfish.co.uk]

Author: joe
Date: Wed Dec  2 13:27:34 2009
New Revision: 1749

Modified:
   neon/branches/0.29.x/src/ne_auth.c
   neon/branches/0.29.x/src/ne_ntlm.c
   neon/branches/0.29.x/src/ne_socket.c

Log:
Merge r1739, r1744, r1746, r1747 from trunk:

* config.hw.in: Fix socklen_t with recent SDKs, thanks to Stefan Kung.

* src/ne_socket.c: Fixed 'missing symbol' win2k runtime problem.

* src/ne_ntlm.c (ne__ntlm_authenticate)
* src/ne_auth.c (ntlm_challenge):
  In case of session timeout, do not call auth callback; use
  existing credentials.

* src/ne_ntlm.c (mkhash): Fix buffer overflow (basic at mozdev.org).


Modified: neon/branches/0.29.x/src/ne_auth.c
==============================================================================
--- neon/branches/0.29.x/src/ne_auth.c	(original)
+++ neon/branches/0.29.x/src/ne_auth.c	Wed Dec  2 13:27:34 2009
@@ -725,7 +725,7 @@
     
     NE_DEBUG(NE_DBG_HTTPAUTH, "auth: NTLM challenge.\n");
     
-    if (!parms->opaque) {
+    if (!parms->opaque && (!sess->ntlm_context || (attempt > 1))) {
         char password[NE_ABUFSIZ];
 
         if (get_credentials(sess, errmsg, attempt, parms, password)) {

Modified: neon/branches/0.29.x/src/ne_ntlm.c
==============================================================================
--- neon/branches/0.29.x/src/ne_ntlm.c	(original)
+++ neon/branches/0.29.x/src/ne_ntlm.c	Wed Dec  2 13:27:34 2009
@@ -356,7 +356,7 @@
     MD4_Update(&md4, pw, 2*len);
     MD4_Final(ntbuffer, &md4);
 
-    memset(ntbuffer+16, 0, 8);
+    memset(ntbuffer+16, 0, 5);
   }
 
   calc_resp(ntbuffer, nonce, ntresp);
@@ -656,6 +656,9 @@
     if (context == NULL) {
 	return -1;
     } else {
+        if (!responseToken && (context->state == NTLMSTATE_TYPE3))
+            context->state = NTLMSTATE_NONE;
+
         if (context->state <= NTLMSTATE_TYPE3) {
 	  ntlm ntlmstatus = ne_input_ntlm(context, responseToken);
 

Modified: neon/branches/0.29.x/src/ne_socket.c
==============================================================================
--- neon/branches/0.29.x/src/ne_socket.c	(original)
+++ neon/branches/0.29.x/src/ne_socket.c	Wed Dec  2 13:27:34 2009
@@ -59,6 +59,7 @@
 #include <stddef.h>
 #ifdef USE_GETADDRINFO
 #include <ws2tcpip.h>
+#include <wspiapi.h>
 #endif
 #endif