From 3df3794fee72ac1da1f5e69d7d2498e35f4d4089 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 17 May 2000 07:13:21 +0000 Subject: [PATCH] Sync with `t-gnus-6_14'. --- ChangeLog | 8 ++++++++ lisp/imap.el | 21 ++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2d945e..5d2ff95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-05-17 Kenichi OKADA + + * lisp/imap.el (imap-digest-md5-auth): Rewrite for the use of + `sasl-digest-md5-digest-response' instead of + `digest-md5-digest-response'. + (TopLevel): Require `sasl' when compiling instead of `digest-md5'; + don't autoload "digest-md5". + 2000-05-17 Katsumi Yamaoka * lisp/nndraft.el (nndraft-request-replace-article): Replace diff --git a/lisp/imap.el b/lisp/imap.el index e07f8fb..a690f34 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -139,7 +139,7 @@ (eval-when-compile (require 'cl)) (eval-when-compile (require 'static)) (eval-when-compile - (ignore-errors (require 'digest-md5))) + (ignore-errors (require 'sasl))) (eval-and-compile (autoload 'open-ssl-stream "ssl") @@ -147,10 +147,6 @@ (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-digest-response "digest-md5") - (autoload 'digest-md5-digest-uri "digest-md5") - (autoload 'digest-md5-challenge "digest-md5") (autoload 'rfc2104-hash "rfc2104") (autoload 'md5 "md5") (autoload 'utf7-encode "utf7") @@ -715,16 +711,11 @@ Returns t if login was successful, nil otherwise." (list "AUTHENTICATE DIGEST-MD5" (lambda (challenge) - (digest-md5-parse-digest-challenge - (base64-decode-string challenge)) - (let* ((digest-uri - (digest-md5-digest-uri - "imap" (digest-md5-challenge 'realm))) - (response - (digest-md5-digest-response - user passwd digest-uri))) - (base64-encode-string response 'no-line-break)))) - ))) + (base64-encode-string + (sasl-digest-md5-digest-response + (base64-decode-string challenge) + user passwd "imap" imap-server) + 'no-line-break)))))) (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE)) nil (setq imap-continuation nil) -- 1.7.10.4