X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=sasl-digest.el;h=9e061b75b49955cdff6284171f357280f93f4e90;hb=57a3177465e8d977a8b2423f4343eefd3adf3d00;hp=793e697a992b4c13cad5f648ab7194c888a181b7;hpb=d06ef0dba09d8e471b15753f99df44979fdabf5c;p=elisp%2Fflim.git

diff --git a/sasl-digest.el b/sasl-digest.el
index 793e697..9e061b7 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)
+	      "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 "\","