From: ueno <ueno>
Date: Mon, 20 Nov 2000 02:29:09 +0000 (+0000)
Subject: * sasl-digest.el (sasl-digest-md5-response): Check "qop-options".
X-Git-Tag: deisui-1_14_0-2000-12-14~13
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c9d87c21880fdb9e1e044164d591589a45591c3d;p=elisp%2Fflim.git

* sasl-digest.el (sasl-digest-md5-response): Check "qop-options".
---

diff --git a/sasl-digest.el b/sasl-digest.el
index 1a1eb8a..793e697 100644
--- a/sasl-digest.el
+++ b/sasl-digest.el
@@ -117,6 +117,8 @@ charset algorithm cipher-opts auth-param)."
 	 (nonce-count
 	  (or (sasl-client-property client 'nonce-count)
 	       sasl-digest-md5-nonce-count))
+	 (qop-options (plist-get plist 'qop))
+	 (qop (sasl-client-property client 'qop))
 	 (digest-uri
 	  (sasl-digest-md5-digest-uri
 	   (sasl-client-service client)(sasl-client-server client)))
@@ -124,6 +126,10 @@ charset algorithm cipher-opts auth-param)."
 	  (or (sasl-client-property client 'cnonce)
 	      (sasl-digest-md5-cnonce))))
     (sasl-client-set-property client 'nonce-count (1+ nonce-count))
+    (if qop-options
+	(setq qop-options (split-string qop-options ",")))
+    (unless (member qop qop-options)
+      (setq qop "auth"))
     (concat
      "username=\"" (sasl-client-name client) "\","
      "realm=\"" realm "\","
@@ -131,6 +137,7 @@ charset algorithm cipher-opts auth-param)."
      "cnonce=\"" cnonce "\","
      (format "nc=%08x," nonce-count)
      "digest-uri=\"" digest-uri "\","
+     "qop=" qop ","
      "response="
      (sasl-digest-md5-response-value
       (sasl-client-name client)
@@ -138,8 +145,7 @@ charset algorithm cipher-opts auth-param)."
       (plist-get plist 'nonce)
       cnonce
       nonce-count
-      (or (sasl-client-property client 'qop)
-	  "auth")
+      qop
       digest-uri
       (plist-get plist 'authzid)))))