X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fcanlock.el;h=d6cb0c519ddd11921f09a9795dea28c453de501e;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=6bdcd3b027c9a579b6fe0330a83d1390998124b2;hpb=38e192fe20856e4fec637d3299ab02f9afb31b56;p=elisp%2Fgnus.git-

diff --git a/lisp/canlock.el b/lisp/canlock.el
index 6bdcd3b..d6cb0c5 100644
--- 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.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
@@ -18,8 +18,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -44,33 +44,24 @@
 (eval-when-compile
   (require 'cl))
 
-(eval-and-compile
-  (require 'sha1-el)
-  (condition-case nil
-      (sha1 "" nil nil 'binary)
-    (wrong-number-of-arguments
-     (let ((mel (locate-library "mel")))
-       (when mel
-	 (load (expand-file-name "sha1-el" (file-name-directory mel))
-	       nil t))))))
+(require 'sha1)
 
-(autoload 'mail-fetch-field "mail-utils")
 (defvar mail-header-separator)
 
 (defgroup canlock nil
   "The Cancel-Lock feature."
-  :group 'applications)
+  :group 'news)
 
 (defcustom canlock-password nil
   "Password to use when signing a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-		(string :tag "Password" :size 0))
+		(string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-password-for-verify canlock-password
   "Password to use when verifying a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-		(string :tag "Password" :size 0))
+		(string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-force-insert-header nil