You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by kw...@apache.org on 2012/12/20 08:14:20 UTC
svn commit: r1424352 -
/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Author: kwright
Date: Thu Dec 20 07:14:20 2012
New Revision: 1424352
URL: http://svn.apache.org/viewvc?rev=1424352&view=rev
Log:
Fix Type3 message assembly problem, part of HTTPCLIENT-1268.
Modified:
httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1424352&r1=1424351&r2=1424352&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Thu Dec 20 07:14:20 2012
@@ -1225,7 +1225,7 @@ final class NTLMEngineImpl implements NT
sessionKeyLen = 0;
// Calculate the layout within the packet
- int lmRespOffset = 76; // allocate space for the version
+ int lmRespOffset = 72; // allocate space for the version
int ntRespOffset = lmRespOffset + lmRespLen;
int domainOffset = ntRespOffset + ntRespLen;
int userOffset = domainOffset + domainLen;
@@ -1276,13 +1276,7 @@ final class NTLMEngineImpl implements NT
addUShort(sessionKeyLen);
// Session key offset
- if (sessionKeyLen != 0)
- addULong(sessionKeyOffset);
- else
- addULong(0);
-
- // Message length
- addULong(finalLength);
+ addULong(sessionKeyOffset);
// Flags. Currently: WORKSTATION_PRESENT + DOMAIN_PRESENT + UNICODE_ENCODING +
// TARGET_DESIRED + NEGOTIATE_128