From db77008efd0183957d2acead58fa5454557c517e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 4 Sep 2002 00:24:37 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 5 +++++ lisp/message.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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 + + * message.el (message-canlock-generate): Make sure sha1 doesn't + call external programs. + 2002-09-03 Simon Josefsson * 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. -- 1.7.10.4