* smtp.el (TopLevel): Autoload `sasl-digest-md5-digest-response'.

[elisp/flim.git] / sasl.el

diff --git a/sasl.el b/sasl.el
index dff52d6..3e78040 100644 (file)
--- a/sasl.el
+++ b/sasl.el
@@ -60,7 +60,6 @@
   (autoload 'starttls-negotiate "starttls")
   (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"))
@@ -83,8 +82,9 @@
   (concat authorid "\0" authenid "\0" passphrase))
 
 ;;; SCRAM-MD5
-(defvar sasl-scram-md5-client-security-info
-  (scram-make-security-info nil t 0))
+(eval-when-compile
+  (defvar sasl-scram-md5-client-security-info
+    (scram-make-security-info nil t 0)))
 
 (defun sasl-scram-md5-make-salted-pass (server-msg-1 passphrase)
   (scram-md5-make-salted-pass
@@ -138,8 +138,9 @@
 
 (defvar sasl-digest-md5-nonce-count 1)
 
-(defun sasl-digest-md5-digest-response (username passwd 
-                                                serv-type host &optional realm)
+(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.
@@ -150,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