Author: dkulp Date: Wed Oct 30 20:32:05 2013 New Revision: 1537288 URL: http://svn.apache.org/r1537288 Log: Merged revisions 1537285 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1537285 | dkulp | 2013-10-30 16:30:17 -0400 (Wed, 30 Oct 2013) | 11 lines Merged revisions 1537281 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1537281 | dkulp | 2013-10-30 16:26:05 -0400 (Wed, 30 Oct 2013) | 3 lines [CXF-5366] DigestAuthSupplier should output the algorithm Patch from Evgeny Shakin applied ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java?rev=1537288&r1=1537287&r2=1537288&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java Wed Oct 30 20:32:05 2013 @@ -145,7 +145,6 @@ public class DigestAuthSupplier implemen MessageDigest digester = MessageDigest.getInstance(digAlg); String a1 = username + ":" + realm + ":" + password; if ("MD5-sess".equalsIgnoreCase(algorithm)) { - algorithm = "MD5"; String tmp2 = encode(digester.digest(a1.getBytes(charset))); a1 = tmp2 + ':' + nonce + ':' + cnonce; } @@ -172,6 +171,7 @@ public class DigestAuthSupplier implemen outParams.put("nc", ncstring); outParams.put("cnonce", cnonce); outParams.put("response", response); + outParams.put("algorithm", algorithm); return new HttpAuthHeader(HttpAuthHeader.AUTH_TYPE_DIGEST, outParams).getFullHeader(); } catch (Exception ex) { throw new RuntimeException(ex);
