Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for HTTPCLIENT-1315. 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1447065 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karl Wright 2013-02-17 20:01:49 +00:00
parent f4447aef19
commit 584309b3e8
3 changed files with 290 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE_NOTES.txt
View File

@ -3,6 +3,10 @@ Changes since 4.3 ALPHA1
* [HTTPCLIENT-1317] InetAddressUtils should handle IPv6 Addresses with Embedded IPv4 Addresses
Contributed Sebastian Bazley <sebb at apache.org>.
* [HTTPCLIENT-1315] NTLM support did not work properly when the target (as returned
in the Type 2 message) differed from the domain as supplied by the user.
Contributed by Karl Wright <kwright at apache.org>
* [HTTPCLIENT-1320] SSLSocketFactory#createSystemSSLContext causes UnrecoverableKeyException
'Password verification failed' when a truststore is specified with 'javax.net.ssl.trustStore'
system property is used without a password.

533
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
View File

File diff suppressed because it is too large Load Diff

14
httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
View File

@ -95,6 +95,8 @@ public class TestNTLMEngineImpl {
null,
null,
null,
null,
null,
null);
checkArraysMatch(toBytes("c337cd5cbd44fc9782a667af6d427c6de67c20c2d3e77c56"),
@ -111,6 +113,8 @@ public class TestNTLMEngineImpl {
null,
null,
null,
null,
null,
null);
checkArraysMatch(toBytes("25a98c1c31e81847466b29b2df4680f39958fb8c213a9cc6"),
@ -124,8 +128,10 @@ public class TestNTLMEngineImpl {
"user",
"SecREt01",
toBytes("0123456789abcdef"),
"DOMAIN",
null,
toBytes("ffffff0011223344"),
toBytes("ffffff0011223344"),
null,
null);
@ -140,8 +146,10 @@ public class TestNTLMEngineImpl {
"user",
"SecREt01",
toBytes("0123456789abcdef"),
"DOMAIN",
toBytes("02000c0044004f004d00410049004e0001000c005300450052005600450052000400140064006f006d00610069006e002e0063006f006d00030022007300650072007600650072002e0064006f006d00610069006e002e0063006f006d0000000000"),
toBytes("ffffff0011223344"),
toBytes("ffffff0011223344"),
null,
toBytes("0090d336b734c301"));
@ -158,8 +166,10 @@ public class TestNTLMEngineImpl {
"user",
"SecREt01",
toBytes("0123456789abcdef"),
"DOMAIN",
toBytes("02000c0044004f004d00410049004e0001000c005300450052005600450052000400140064006f006d00610069006e002e0063006f006d00030022007300650072007600650072002e0064006f006d00610069006e002e0063006f006d0000000000"),
toBytes("ffffff0011223344"),
toBytes("ffffff0011223344"),
null,
toBytes("0090d336b734c301"));
@ -174,8 +184,10 @@ public class TestNTLMEngineImpl {
"user",
"SecREt01",
toBytes("0123456789abcdef"),
"DOMAIN",
toBytes("02000c0044004f004d00410049004e0001000c005300450052005600450052000400140064006f006d00610069006e002e0063006f006d00030022007300650072007600650072002e0064006f006d00610069006e002e0063006f006d0000000000"),
toBytes("ffffff0011223344"),
toBytes("ffffff0011223344"),
null,
toBytes("0090d336b734c301"));
@ -190,8 +202,10 @@ public class TestNTLMEngineImpl {
"user",
"SecREt01",
toBytes("0123456789abcdef"),
"DOMAIN",
toBytes("02000c0044004f004d00410049004e0001000c005300450052005600450052000400140064006f006d00610069006e002e0063006f006d00030022007300650072007600650072002e0064006f006d00610069006e002e0063006f006d0000000000"),
toBytes("ffffff0011223344"),
toBytes("ffffff0011223344"),
null,
toBytes("0090d336b734c301"));