From d629e3c9b763bd0c8cae30fcb395c0a1564eefa0 Mon Sep 17 00:00:00 2001 From: okada Date: Mon, 13 Dec 1999 05:57:45 +0000 Subject: [PATCH] * sasl.el (sasl-scram-md5-make-salted-pass): New function. * smtp.el (smtp-auth-scram-md5): Use `sasl-scram-md5-make-salted-pass' instead of `scram-md5-make-salted-pass' and `scram-md5-parse-server-msg-1'. --- ChangeLog | 6 ++++++ sasl.el | 6 ++++++ smtp.el | 6 ++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2914824..37bda60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 1999-12-13 Kenichi OKADA + * sasl.el (sasl-scram-md5-make-salted-pass): New function. + * smtp.el (smtp-auth-scram-md5): Use `sasl-scram-md5-make-salted-pass' + instead of `scram-md5-make-salted-pass' and `scram-md5-parse-server-msg-1'. + +1999-12-13 Kenichi OKADA + * digest-md5.el (digest-md5-parse-digest-challenge): Fix. 1999-12-13 Kenichi OKADA diff --git a/sasl.el b/sasl.el index 66f278e..53236db 100644 --- a/sasl.el +++ b/sasl.el @@ -70,6 +70,12 @@ (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)) diff --git a/smtp.el b/smtp.el index 9d0bd64..f2b8365 100644 --- a/smtp.el +++ b/smtp.el @@ -606,10 +606,8 @@ don't define this value." (sasl-scram-md5-client-msg-2 server-msg-1 client-msg-1 (setq salted-pass - (scram-md5-make-salted-pass - smtp-authentication-passphrase - (car - (scram-md5-parse-server-msg-1 server-msg-1)))))) + (sasl-scram-md5-make-salted-pass + smtp-authentication-passphrase server-msg-1)))) (setq secure-word (unwind-protect (base64-encode-string secure-word) -- 1.7.10.4