Index: httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java =================================================================== --- httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (revision 1815630) +++ httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (working copy) @@ -211,7 +211,7 @@ private static int readULong(final byte[] src, final int index) throws NTLMEngineException { if (src.length < index + 4) { - throw new NTLMEngineException("NTLM authentication - buffer too small for DWORD"); + return 0; } return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8) | ((src[index + 2] & 0xff) << 16) | ((src[index + 3] & 0xff) << 24); @@ -219,7 +219,7 @@ private static int readUShort(final byte[] src, final int index) throws NTLMEngineException { if (src.length < index + 2) { - throw new NTLMEngineException("NTLM authentication - buffer too small for WORD"); + return 0; } return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8); } @@ -228,8 +228,7 @@ final int length = readUShort(src, index); final int offset = readULong(src, index + 4); if (src.length < offset + length) { - throw new NTLMEngineException( - "NTLM authentication - buffer too small for data item"); + return new byte[length]; } final byte[] buffer = new byte[length]; System.arraycopy(src, offset, buffer, 0, length);