* sasl.el (TopLevel): Delete function `sasl-digest-md5-parse-digest-challenge'.

	* smtp.el (smtp-auth-digest-md5): Don't use `sasl-digest-md5-parse-digest-challenge'.

diff --git a/ChangeLog b/ChangeLog
index 22e1c64..438c20b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-01-21  Kenichi OKADA <okada@opaopa.org>
 
+       * sasl.el (TopLevel): Delete function `sasl-digest-md5-parse-digest-challenge'.
+       * smtp.el (smtp-auth-digest-md5): Don't use `sasl-digest-md5-parse-digest-challenge'.
+
+2000-01-21  Kenichi OKADA <okada@opaopa.org>
+
        * scram-md5.el (sasl-scram-md5-client-security-info): Eval when compile.
 
 2000-01-21  Kenichi OKADA <okada@opaopa.org>

diff --git a/digest-md5.el b/digest-md5.el
index 4ecd228..4ca8def 100644 (file)
--- a/digest-md5.el
+++ b/digest-md5.el
@@ -48,7 +48,6 @@
 (require 'unique-id)
 
 (defvar digest-md5-challenge nil)
-;(defvar digest-md5-nonce-count 1)
 
 (defvar digest-md5-parse-digest-challenge-syntax-table
   (let ((table (make-syntax-table)))

diff --git a/sasl.el b/sasl.el
index 659e92b..69c81bf 100644 (file)
--- a/sasl.el
+++ b/sasl.el
@@ -58,9 +58,8 @@
   (autoload 'base64-encode-string "base64")
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls")
-  (autoload 'digest-md5-parse-digest-challenge "digest-md5")
+;  (autoload 'digest-md5-parse-digest-challenge "digest-md5")
   (autoload 'digest-md5-digest-response "digest-md5")
-;  (autoload 'scram-make-security-info "scram-md5")
   (autoload 'scram-md5-make-salted-pass "scram-md5")
   (autoload 'scram-md5-parse-server-msg-1 "scram-md5")
   (autoload 'scram-md5-make-client-msg-1 "scram-md5"))
@@ -139,8 +138,9 @@
 
 (defvar sasl-digest-md5-nonce-count 1)
 
-(defun sasl-digest-md5-digest-response (username passwd 
+(defun sasl-digest-md5-digest-response (digest-challenge username passwd
                                                 serv-type host &optional realm)
+  (digest-md5-parse-digest-challenge digest-challenge)
   (digest-md5-digest-response
    username
    (or realm (digest-md5-challenge 'realm)) ;; need to check.
@@ -151,9 +151,6 @@
    (digest-md5-digest-uri serv-type host) ;; MX host
    ))
 
-(defun sasl-digest-md5-parse-digest-challenge (digest-challenge)
-  (digest-md5-parse-digest-challenge digest-challenge))
-
 (provide 'sasl)
 
 ;;; sasl.el ends here
\ No newline at end of file

diff --git a/smtp.el b/smtp.el
index 913e1a4..c057d01 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -104,8 +104,7 @@ don't define this value."
     (login smtp-auth-login)
     (anonymous smtp-auth-anonymous)
     (scram-md5 smtp-auth-scram-md5)
-    (digest-md5 smtp-auth-digest-md5)
-    ))
+    (digest-md5 smtp-auth-digest-md5)))
 
 (defcustom smtp-connection-type nil
   "*SMTP connection type."
@@ -666,9 +665,6 @@ don't define this value."
            (not (integerp (car response)))
            (>= (car response) 400))
        (throw 'done (car (cdr response))))
-    (sasl-digest-md5-parse-digest-challenge
-     (base64-decode-string
-      (substring (car (cdr response)) 4)))
     (if (string-match "^\\([^@]*\\)@\\([^@]*\\)"
                      smtp-authenticate-user)
        (setq user (match-string 1 smtp-authenticate-user)
@@ -678,6 +674,8 @@ don't define this value."
     (smtp-send-command process
                       (base64-encode-string
                        (sasl-digest-md5-digest-response
+                        (base64-decode-string
+                         (substring (car (cdr response)) 4))
                         user
                         smtp-authenticate-passphrase
                         "smtp" smtp-server realm)