From 954bd12fdb54f5ba73b87a9223693f7b1e39353e Mon Sep 17 00:00:00 2001
From: okada <okada>
Date: Tue, 30 Nov 1999 16:27:47 +0000
Subject: [PATCH] * SLIM-VERSION: Fix. * smtp.el: Fix Author. * sasl.el
 (sasl-cram-md5): Update to delete insecure sequences at
 plain.

---
 ChangeLog    |    7 +++++++
 SLIM-VERSION |    2 +-
 sasl.el      |   15 +++++++++++----
 smtp.el      |    8 ++++----
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3622e66..debba6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-12-01  Kenichi OKADA <okada@opaopa.org>
+
+        * SLIM-VERSION: Fix.
+	* smtp.el: Fix Author.
+	* sasl.el (sasl-cram-md5): Update to delete
+        insecure sequences at plain.
+
 1999-11-28  Kenichi OKADA <okada@opaopa.org>
 
 	* mime-def.el (mime-library-product): Up.
diff --git a/SLIM-VERSION b/SLIM-VERSION
index 44766a3..63129d7 100644
--- a/SLIM-VERSION
+++ b/SLIM-VERSION
@@ -4,5 +4,5 @@
 1.13.1 深田恭子
 1.13.2 華原朋美
 1.13.3 飯島直子
+1.13.4 榊原郁恵
 ------ 山瀬まみ
------- 榊原郁恵
\ No newline at end of file
diff --git a/sasl.el b/sasl.el
index 9de496b..db86609 100644
--- a/sasl.el
+++ b/sasl.el
@@ -27,10 +27,17 @@
 (require 'hmac-md5)
 
 (defun sasl-cram-md5 (username passphrase challenge)
-  (concat username " "
-	  (encode-hex-string
-	   (hmac-md5 challenge passphrase))))
-
+  (let ((secure-word (copy-sequence passphrase)))
+    (setq secure-word (unwind-protect
+			  (hmac-md5 challenge secure-word)
+			(fillarray secure-word 0))
+	  secure-word (unwind-protect
+			  (encode-hex-string secure-word)
+			(fillarray secure-word 0))
+	  secure-word (unwind-protect
+			  (concat username " " secure-word)
+			(fillarray secure-word 0)))))
+		
 (defun sasl-plain (authorid authenid passphrase)
   (concat authorid "\0" authenid "\0" passphrase))
 
diff --git a/smtp.el b/smtp.el
index 9fcad89..77f43ad 100644
--- a/smtp.el
+++ b/smtp.el
@@ -3,10 +3,10 @@
 ;; Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
-;;         Simon Leinen <simon@switch.ch> (ESMTP support)
-;;         Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;;         Kenichi OKADA <okada@opaopa.org> (SASL support)
-;;         Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;;	Simon Leinen <simon@switch.ch> (ESMTP support)
+;;	Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
+;;	Kenichi OKADA <okada@opaopa.org> (SASL support)
+;;	Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
 ;; Maintainer: Kenichi OKADA <okada@opaopa.org>
 ;; Keywords: SMTP, mail, SASL
 
-- 
1.7.10.4