From c3674f7497b6e6c3b8aa8ae8dc2d201532e95a84 Mon Sep 17 00:00:00 2001 From: okada Date: Sun, 28 Nov 1999 08:50:44 +0000 Subject: [PATCH] * ChangeLog: Fix. 1999-10-?? -> 1999-11-?? * sasl.el (sasl-cram-md5): Rename `username' from `user'. Rename `challenge' from `response'. * SLIM-VERION: Add code name. --- ChangeLog | 51 +++++++++++++++++++++++++++++---------------------- SLIM-VERSION | 2 ++ sasl.el | 6 +++--- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index f60d7a3..a0863f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,24 +1,31 @@ -1999-10-23 Kenichi OKADA +1999-11-28 Kenichi OKADA + + * ChangeLog: Fix. + * sasl.el (sasl-cram-md5): Rename `username' from `user'. + Rename `challenge' from `response'. + * SLIM-VERION: Add code name. + +1999-11-23 Kenichi OKADA * sha1.el (sha1-encode): Fix and define as obsolete function. (sha1-encode-binary): Ditto. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * sha1.el (sha1-encode): New alias. (sha1-encode-binary): Ditto. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * SLIM: Version 1.13.3 released. -1999-10-23 Tsunehiko Baba +1999-11-23 Tsunehiko Baba * sasl.el: Don't require `hmac-util'. (sasl-cram-md5): Update to use encode-hex-string. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * sha1.el: Update. * sha1-el.el: Update. @@ -43,7 +50,7 @@ sha1-el.el (sha1-region-internal): Ditto. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * SLIM: Version 1.13.2 released. @@ -54,27 +61,27 @@ (smtp-auth-login): Update to delete insecure sequences at plain. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * smtp.el (smtp-auth-cram-md5): New function. (smtp-auth-plain): New function. (smtp-auth-login): New function. (smtp-authentication-method-alist): New variable. -1999-10-23 Kenichi OKADA +1999-11-23 Kenichi OKADA * hex-util.el: New file. * hmac-util.el: Remove. * hmac-md5.el: Update. * FLIM-ELS (flim-modeules): Rename `hex-util' from `hmac-util'. -1999-10-22 Kenichi OKADA +1999-11-22 Kenichi OKADA * smtp.el (smtp-via-smtp): Fix to use `smtp-authentication-type', `smtp-authentication-user', `smtp-authentication-passphrase' and `smtp-connection-type'. -1999-10-22 Daiki Ueno +1999-11-22 Daiki Ueno * smtp.el (smtp-authentication-type): New variable. (smtp-authentication-user): New variable. @@ -82,22 +89,22 @@ (smtp-connection-type): New variable. -1999-10-21 Kenichi OKADA +1999-11-21 Kenichi OKADA * SLIM: Version 1.13.1 released. -1999-10-21 Kenichi OKADA +1999-11-21 Kenichi OKADA * SLIM-TIPS: Add comment. -1999-10-21 Kenichi OKADA +1999-11-21 Kenichi OKADA * smtp.el (smtp-via-smtp): Add autoload for `starttls-open-stream', `starttls-negotiate', `sasl-cram-md5' and `sasl-plain'. * smtp.el (smtp-via-smtp): Don't require `sasl' and `starttls'. -1999-10-21 Kenichi OKADA +1999-11-21 Kenichi OKADA * starttls.c: New file. * smtp.el (smtp-via-smtp): STARTTLS support. @@ -105,7 +112,7 @@ * starttls.c: Deleted. See SLIM-TIPS. * FLIM-ELS (flim-modules): Add `starttls' -1999-10-21 Daiki Ueno +1999-11-21 Daiki Ueno * starttls.el: New file. * starttls.c: New file. @@ -117,22 +124,22 @@ * SLIM-VERION: Add code name. * mime-def.el (mime-library-product): Up. -1999-10-20 Shuhei KOBAYASHI +1999-11-20 Shuhei KOBAYASHI * hmac-def.el (define-hmac-function): Update to delete insecure sequences. -1999-10-20 Kenichi OKADA +1999-11-20 Kenichi OKADA * SLIM: Version 1.13.0 released. -1999-10-20 Kenichi OKADA +1999-11-20 Kenichi OKADA * smtp.el (smtp-via-smtp): Fix typo. * hmac-md5.el: Add Author and Maintainer. -1999-10-20 Kenichi OKADA +1999-11-20 Kenichi OKADA * hmac-md5.el (hmac-md5): Specify the 4th arg to `md5' as `binary' if possible. @@ -141,7 +148,7 @@ * hmac-md5.el (hmac-md5): Fixed for XEmacs's md5. -1999-10-19 Kenichi OKADA +1999-11-19 Kenichi OKADA * md5.el: New file. (import from hmac package) * md5-el.el: New file. (import from hmac package) @@ -156,12 +163,12 @@ * FLIM-ELS (flim-modules): Add `md5 md5-el md5-dl sha1 sha1-el sha1-dl hmac-def hmac-util hmac-md5 hmac-sha1'. -1999-10-19 Kenichi OKADA +1999-11-19 Kenichi OKADA * SLIM-VERSION: New file. * sasl.el: Add keyword. -1999-10-19 Kenichi OKADA +1999-11-19 Kenichi OKADA * sasl.el: New file. * smtp.el (smtp-via-smtp): Use sasl.el for SASL. diff --git a/SLIM-VERSION b/SLIM-VERSION index be9c519..44766a3 100644 --- a/SLIM-VERSION +++ b/SLIM-VERSION @@ -4,3 +4,5 @@ 1.13.1 深田恭子 1.13.2 華原朋美 1.13.3 飯島直子 +------ 山瀬まみ +------ 榊原郁恵 \ No newline at end of file diff --git a/sasl.el b/sasl.el index f9d001f..9de496b 100644 --- a/sasl.el +++ b/sasl.el @@ -26,10 +26,10 @@ (require 'hmac-md5) -(defun sasl-cram-md5 (user passphrase response) - (concat user " " +(defun sasl-cram-md5 (username passphrase challenge) + (concat username " " (encode-hex-string - (hmac-md5 response passphrase)))) + (hmac-md5 challenge passphrase)))) (defun sasl-plain (authorid authenid passphrase) (concat authorid "\0" authenid "\0" passphrase)) -- 1.7.10.4