From e1aa2acafb97fa772b053a4b3f23e49ce5a98205 Mon Sep 17 00:00:00 2001 From: okada Date: Sun, 19 Nov 2000 15:25:06 +0000 Subject: [PATCH] * elmo-pop3.el (elmo-pop3-auth-digest-md5): Delete. (elmo-pop3-auth-scram-md5): Ditto. (elmo-pop3-auth-cram-md5): Ditto. --- elmo/ChangeLog | 6 ++++ elmo/elmo-pop3.el | 89 ----------------------------------------------------- 2 files changed, 6 insertions(+), 89 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 2b6bd8f..7620ab2 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,11 @@ 2000-11-19 Kenichi OKADA + * elmo-pop3.el (elmo-pop3-auth-digest-md5): Delete. + (elmo-pop3-auth-scram-md5): Ditto. + (elmo-pop3-auth-cram-md5): Ditto. + +2000-11-19 Kenichi OKADA + * elmo-pop3.el (toplevel): Delete defun-maybe for sasl-*. Delete `elmo-pop3-authenticator-alist'. diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index 407f35e..30eb8cc 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -188,95 +188,6 @@ (signal 'elmo-authenticate-error '(elmo-pop3-auth-apop)))) (signal 'elmo-open-error '(elmo-pop-auth-user)))) - -(defun elmo-pop3-auth-cram-md5 (session) - (let ((process (elmo-network-session-process-internal session)) - response) - (elmo-pop3-send-command process "auth cram-md5") - (or (setq response - (elmo-pop3-read-response process t)) - (signal 'elmo-open-error '(elmo-pop-auth-cram-md5))) - (elmo-pop3-send-command - process - (elmo-base64-encode-string - (sasl-cram-md5 (elmo-network-session-user-internal session) - (elmo-get-passwd - (elmo-network-session-password-key session)) - (elmo-base64-decode-string - (cadr (split-string response " ")))))) - (or (elmo-pop3-read-response process t) - (signal 'elmo-authenticate-error - '(elmo-pop-auth-cram-md5))))) - -(defun elmo-pop3-auth-scram-md5 (session) - (let ((process (elmo-network-session-process-internal session)) - server-msg-1 server-msg-2 client-msg-1 client-msg-2 - salted-pass response) - (elmo-pop3-send-command - process - (format "auth scram-md5 %s" - (elmo-base64-encode-string - (setq client-msg-1 - (sasl-scram-md5-client-msg-1 - (elmo-network-session-user-internal session)))))) - (or (elmo-pop3-read-response process t) - (signal 'elmo-open-error '(elmo-pop-auth-scram-md5))) - (setq server-msg-1 - (elmo-base64-decode-string (cadr (split-string response " ")))) - (elmo-pop3-send-command - process - (elmo-base64-encode-string - (sasl-scram-md5-client-msg-2 - server-msg-1 - client-msg-1 - (setq salted-pass - (sasl-scram-md5-make-salted-pass - server-msg-1 - (elmo-get-passwd - (elmo-network-session-password-key session))))))) - (or (setq response (elmo-pop3-read-response process t)) - (signal 'elmo-authenticate-error - '(elmo-pop-auth-scram-md5))) - (setq server-msg-2 (elmo-base64-decode-string - (cadr (split-string response " ")))) - (or (sasl-scram-md5-authenticate-server server-msg-1 - server-msg-2 - client-msg-1 - salted-pass) - (signal 'elmo-authenticate-error - '(elmo-pop-auth-scram-md5))) - (elmo-pop3-send-command process "") - (or (setq response (elmo-pop3-read-response process t)) - (signal 'elmo-authenticate-error - '(elmo-pop-auth-scram-md5))))) - -(defun elmo-pop3-auth-digest-md5 (session) - (let ((process (elmo-network-session-process-internal session)) - response) - (elmo-pop3-send-command process "auth digest-md5") - (or (setq response - (elmo-pop3-read-response process t)) - (signal 'elmo-open-error - '(elmo-pop-auth-digest-md5))) - (elmo-pop3-send-command - process - (elmo-base64-encode-string - (sasl-digest-md5-digest-response - (elmo-base64-decode-string - (cadr (split-string response " "))) - (elmo-network-session-user-internal session) - (elmo-get-passwd - (elmo-network-session-password-key session)) - "pop" - (elmo-network-session-host-internal session)) - 'no-line-break)) - (or (elmo-pop3-read-response process t) - (signal 'elmo-authenticate-error - '(elmo-pop-auth-digest-md5))) - (elmo-pop3-send-command process "") - (or (elmo-pop3-read-response process t) - (signal 'elmo-open-error - '(elmo-pop-auth-digest-md5))))) ;;; dirty hack (defconst sasl-pop3-user-steps -- 1.7.10.4