From: yamaoka <yamaoka>
Date: Wed, 4 Sep 2002 00:24:37 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-01-quimby~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db77008efd0183957d2acead58fa5454557c517e;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47fe33c..480f5b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-04  Simon Josefsson  <jas@extundo.com>
+
+	* message.el (message-canlock-generate): Make sure sha1 doesn't
+	call external programs.
+
 2002-09-03  Simon Josefsson  <jas@extundo.com>
 
 	* nntp.el (nntp-wait-for-string): Dont infloop if process died.
diff --git a/lisp/message.el b/lisp/message.el
index 11c7274..71c8fd6 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3692,10 +3692,11 @@ documentation for the function `mail-source-touch-pop'."
 (defun message-canlock-generate ()
   "Return a string that is non-trival to guess.
 Do not use this for anything important, it is cryptographically weak."
-  (sha1 (concat (message-unique-id)
-		(format "%x%x%x" (random) (random t) (random))
-		(prin1-to-string (recent-keys))
-		(prin1-to-string (garbage-collect)))))
+  (let (sha1-maximum-internal-length)
+    (sha1 (concat (message-unique-id)
+		  (format "%x%x%x" (random) (random t) (random))
+		  (prin1-to-string (recent-keys))
+		  (prin1-to-string (garbage-collect))))))
 
 (defun message-canlock-password ()
   "The password used by message for cancel locks.