fix

[elisp/flim.git] / sasl.el

diff --git a/sasl.el b/sasl.el
index 66f278e..69709a6 100644 (file)
--- a/sasl.el
+++ b/sasl.el
@@ -47,7 +47,21 @@
 ;;; Code:
 
 (require 'hmac-md5)
-(require 'scram-md5)
+
+(eval-when-compile
+  (require 'scram-md5)
+  (require 'digest-md5))
+
+(eval-and-compile
+  (autoload 'open-ssl-stream "ssl")
+  (autoload 'base64-decode-string "base64")
+  (autoload 'base64-encode-string "base64")
+  (autoload 'starttls-open-stream "starttls")
+  (autoload 'starttls-negotiate "starttls")
+  (autoload 'digest-md5-digest-response "digest-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"))
 
 ;;; CRAM-MD5
 (defun sasl-cram-md5 (username passphrase challenge)
@@ -67,8 +81,15 @@
   (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
+   passphrase
+   (car
+    (scram-md5-parse-server-msg-1 server-msg-1))))
 
 (defun sasl-scram-md5-client-msg-1 (authenticate-id &optional authorize-id)
   (scram-md5-make-client-msg-1 authenticate-id authorize-id))
@@ -112,6 +133,23 @@
             (scram-md5-parse-server-msg-1 server-msg-1))
            salted-pass)))
 
+;;; DIGEST-MD5
+
+(defvar sasl-digest-md5-nonce-count 1)
+
+(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.
+   passwd
+   (digest-md5-challenge 'nonce)
+   (digest-md5-cnonce)
+   sasl-digest-md5-nonce-count
+   (digest-md5-digest-uri serv-type host) ;; MX host
+   ))
+
 (provide 'sasl)
 
-;;; sasl.el ends here
+;;; sasl.el ends here
\ No newline at end of file