From: ueno <ueno>
Date: Mon, 20 Nov 2000 02:58:52 +0000 (+0000)
Subject: * sasl-digest.el (sasl-digest-md5-response): Signal an error if "qop"
X-Git-Tag: deisui-1_14_0-2000-12-14~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=974480c5c6b215f62b911cf7e6657a03d7ae02e4;p=elisp%2Fflim.git

* sasl-digest.el (sasl-digest-md5-response): Signal an error if "qop"
requires integrity layer.
---

diff --git a/sasl-digest.el b/sasl-digest.el
index 793e697..7454a74 100644
--- a/sasl-digest.el
+++ b/sasl-digest.el
@@ -104,7 +104,7 @@ charset algorithm cipher-opts auth-param)."
 	   (encode-hex-string
 	    (md5-binary
 	     (concat "AUTHENTICATE:" digest-uri
-		     (if (string-equal "auth-int" qop)
+		     (if (member qop '("auth-int" "auth-conf"))
 			 ":00000000000000000000000000000000")))))))
       (fillarray passphrase 0))))
 
@@ -117,8 +117,9 @@ 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))
+	 (qop
+	  (or (sasl-client-property client 'qop)
+	      (setq qop "auth")))
 	 (digest-uri
 	  (sasl-digest-md5-digest-uri
 	   (sasl-client-service client)(sasl-client-server client)))
@@ -126,10 +127,8 @@ 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"))
+    (unless (string= qop "auth")
+      (sasl-error (format "Unsupported \"qop-value\": %s" qop)))
     (concat
      "username=\"" (sasl-client-name client) "\","
      "realm=\"" realm "\","