Synch to No Gnus 200409231508.

[elisp/gnus.git-] / lisp / canlock.el

diff --git a/lisp/canlock.el b/lisp/canlock.el
index 310c9cf..cb88eed 100644 (file)
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -1,7 +1,7 @@
 ;;; canlock.el --- functions for Cancel-Lock feature
 
 ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
-;; Free Software Foundation, Inc.
+;;        Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
@@ -44,10 +44,8 @@
 (eval-when-compile
   (require 'cl))
 
-(autoload 'sha1 "sha1-el")
-(autoload 'sha1-binary "sha1-el")
-(autoload 'base64-encode-string "base64")
-(autoload 'mail-fetch-field "mail-utils")
+(require 'sha1)
+
 (defvar mail-header-separator)
 
 (defgroup canlock nil
@@ -82,8 +80,9 @@ buffer does not look like a news message."
 (defun canlock-sha1 (message)
   "Make a SHA-1 digest of MESSAGE as a unibyte string of length 20 bytes."
   (condition-case nil
-      (sha1 message nil nil 'binary)
-    (error
+      (let (sha1-maximum-internal-length)
+       (sha1 message nil nil 'binary))
+    (wrong-number-of-arguments
      (canlock-string-as-unibyte (sha1-binary message)))))
 
 (defun canlock-make-cancel-key (message-id password)