Merge pull request #2020 from tomjepp/master

[mono.git] / mcs / class / System / System.Net / DigestClient.cs

diff --git a/mcs/class/System/System.Net/DigestClient.cs b/mcs/class/System/System.Net/DigestClient.cs
index da240e75db093d897615e12a21fd4072c734179d..f570a7396506149012bed764229b3562da8d7c98 100644 (file)
--- a/mcs/class/System/System.Net/DigestClient.cs
+++ b/mcs/class/System/System.Net/DigestClient.cs
@@ -181,7 +181,7 @@ namespace System.Net
                        }
 
                        value = header.Substring (beginQ, pos - beginQ);
-                       pos += 2;
+                       pos += useQuote ? 2 : 1;
                        return true;
                }
        }
@@ -250,7 +250,7 @@ namespace System.Net
 
                        // build the hash object (only MD5 is defined in RFC2617)
                        if ((parser.Algorithm == null) || (parser.Algorithm.ToUpper ().StartsWith ("MD5")))
-                               hash = HashAlgorithm.Create ("MD5");
+                               hash = MD5.Create ();
 
                        return true;
                }
@@ -329,7 +329,7 @@ namespace System.Net
                        auth.AppendFormat ("response=\"{0}\", ", Response (userName, password, request));
 
                        if (QOP != null) { // quality of protection (server decision)
-                               auth.AppendFormat ("qop={0}, ", QOP);
+                               auth.AppendFormat ("qop=\"{0}\", ", QOP);
                        }
 
                        lock (this) {
@@ -413,13 +413,16 @@ namespace System.Net
                        if (request == null)
                                return null;
 
-                       int hashcode = request.Address.GetHashCode () ^ credentials.GetHashCode ();
+                       DigestSession currDS = new DigestSession();
+                       if (!currDS.Parse (challenge))
+                               return null;
+
+                       int hashcode = request.Address.GetHashCode () ^ credentials.GetHashCode () ^ currDS.Nonce.GetHashCode ();
                        DigestSession ds = (DigestSession) Cache [hashcode];
                        bool addDS = (ds == null);
                        if (addDS)
-                               ds = new DigestSession ();
-
-                       if (!ds.Parse (challenge))
+                               ds = currDS;
+                       else if (!ds.Parse (challenge))
                                return null;
 
                        if (addDS)