;;; canlock.el --- functions for Cancel-Lock feature
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
+;; Free Software Foundation, Inc.
;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
(eval-when-compile
(require 'cl))
-(autoload 'sha1-binary "sha1-el")
+(autoload 'sha1 "sha1-el")
(autoload 'base64-encode-string "base64")
(autoload 'mail-fetch-field "mail-utils")
(defvar mail-header-separator)
"The Cancel-Lock feature."
:group 'applications)
-(defcustom canlock-sha1-function 'sha1-binary
- "Function to call to make a SHA-1 message digest."
- :type '(radio (function-item sha1-binary)
- (function-item canlock-sha1-with-openssl)
- (function :tag "Other"))
- :group 'canlock)
-
-(defcustom canlock-sha1-function-for-verify canlock-sha1-function
- "Function to call to make a SHA-1 message digest for verifying."
- :type '(radio (function-item sha1-binary)
- (function-item canlock-sha1-with-openssl)
- (function :tag "Other"))
- :group 'canlock)
-
-(defcustom canlock-openssl-program "openssl"
- "Name of OpenSSL program."
- :type 'string
- :group 'canlock)
-
-(defcustom canlock-openssl-args '("sha1")
- "Arguments passed to the OpenSSL program."
- :type 'sexp
- :group 'canlock)
-
-(defcustom canlock-ignore-errors nil
- "If non-nil, ignore any error signals."
- :type 'boolean
- :group 'canlock)
-
(defcustom canlock-password nil
"Password to use when signing a Cancel-Lock or a Cancel-Key header."
:type '(radio (const :format "Not specified " nil)
:type 'boolean
:group 'canlock)
-(defun canlock-sha1-with-openssl (message)
- "Make a SHA-1 digest of MESSAGE using OpenSSL."
- (let (default-enable-multibyte-characters)
- (with-temp-buffer
- (let ((coding-system-for-read 'binary)
- (coding-system-for-write 'binary)
- selective-display
- (case-fold-search t))
- (insert message)
- (apply 'call-process-region (point-min) (point-max)
- canlock-openssl-program t t nil canlock-openssl-args)
- (goto-char (point-min))
- (insert "\"")
- (while (re-search-forward "\\([0-9a-f][0-9a-f]\\)" nil t)
- (replace-match "\\\\x\\1"))
- (insert "\"")
- (goto-char (point-min))
- (read (current-buffer))))))
-
(eval-when-compile
(defmacro canlock-string-as-unibyte (string)
"Return a unibyte string with the same individual bytes as STRING."
(defun canlock-sha1 (message)
"Make a SHA-1 digest of MESSAGE as a unibyte string of length 20 bytes."
- (canlock-string-as-unibyte (funcall canlock-sha1-function message)))
+ (sha1 message nil nil 'binary))
(defun canlock-make-cancel-key (message-id password)
"Make a Cancel-Key header."
(defun canlock-verify (&optional buffer)
"Verify Cancel-Lock or Cancel-Key in BUFFER.
If BUFFER is nil, the current buffer is assumed. Signal an error if
-it fails. You can modify the behavior of this function to return non-
-nil instead of to signal an error by setting the option
-`canlock-ignore-errors' to non-nil."
+it fails."
(interactive)
- (let ((canlock-sha1-function (or canlock-sha1-function-for-verify
- canlock-sha1-function))
- keys locks errmsg id-for-key id-for-lock password
- key-for-key key-for-lock match)
+ (let (keys locks errmsg id-for-key id-for-lock password
+ key-for-key key-for-lock match)
(save-excursion
(when buffer
(set-buffer buffer))
id-for-lock (mail-fetch-field "Message-ID"))
(or id-for-key id-for-lock
(setq errmsg "There are no Message-ID(s)")))))
-
(if errmsg
- (if canlock-ignore-errors
- errmsg
- (error "%s" errmsg))
-
+ (error "%s" errmsg)
(setq password (or canlock-password-for-verify
(read-passwd "Password for Canlock: ")))
(if (or (not (stringp password)) (zerop (length password)))
- (progn
- (setq errmsg "Password for Canlock is bad")
- (if canlock-ignore-errors
- errmsg
- (error "%s" errmsg)))
-
+ (error "Password for Canlock is bad")
(when keys
(when id-for-key
(setq key-for-key (canlock-make-cancel-key id-for-key password))
(setq match (string-equal key-for-key (pop keys)))))
(setq keys (if match "good" "bad")))
(setq match nil)
-
(when locks
(when id-for-lock
(setq key-for-lock
(when (and locks (not match))
(setq match (string-equal key-for-lock (pop locks)))))
(setq locks (if match "good" "bad")))
-
(prog1
(when (member "bad" (list keys locks))
"bad")
-;;; sha1-el.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp.
+;;; sha1-el.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
-;; Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
;; Keywords: SHA1, FIPS 180-1
:type 'boolean
:group 'sha1)
-(defun sha1-string-external (string)
+(defun sha1-string-external (string &optional binary)
;; `with-temp-buffer' is new in v20, so we do not use it.
(save-excursion
(let (buffer)
(unwind-protect
- (let (prog args)
+ (let (prog args digest)
(if (consp sha1-program)
(setq prog (car sha1-program)
args (cdr sha1-program))
(point-min)(point-max)
prog t t nil args)
;; SHA1 is 40 bytes long in hexadecimal form.
- (buffer-substring (point-min)(+ (point-min) 40)))
+ (setq digest (buffer-substring (point-min)(+ (point-min) 40)))
+ (if binary
+ (decode-hex-string digest)
+ digest))
(and buffer
(buffer-name buffer)
(kill-buffer buffer))))))
-(defun sha1-region-external (beg end)
- (sha1-string-external (buffer-substring-no-properties beg end)))
+(defun sha1-region-external (beg end &optional binary)
+ (sha1-string-external (buffer-substring-no-properties beg end) binary))
;;;
;;; internal SHA1 function.
(fillarray block-high nil)
(fillarray block-low nil))))
-(defun sha1-string-internal (string)
- (encode-hex-string (sha1-binary string)))
+(defun sha1-string-internal (string &optional binary)
+ (if binary
+ (sha1-binary string)
+ (encode-hex-string (sha1-binary string))))
-(defun sha1-region-internal (beg end)
- (sha1-string-internal (buffer-substring-no-properties beg end)))
+(defun sha1-region-internal (beg end &optional binary)
+ (sha1-string-internal (buffer-substring-no-properties beg end) binary))
;;;
;;; application interface.
;;;
-(defun sha1-region (beg end)
+(defun sha1-region (beg end &optional binary)
(if (and sha1-use-external
sha1-maximum-internal-length
(> (abs (- end beg)) sha1-maximum-internal-length))
- (sha1-region-external beg end)
- (sha1-region-internal beg end)))
+ (sha1-region-external beg end binary)
+ (sha1-region-internal beg end binary)))
-(defun sha1-string (string)
+(defun sha1-string (string &optional binary)
(if (and sha1-use-external
sha1-maximum-internal-length
(> (length string) sha1-maximum-internal-length))
- (sha1-string-external string)
- (sha1-string-internal string)))
+ (sha1-string-external string binary)
+ (sha1-string-internal string binary)))
;;;###autoload
-(defun sha1 (object &optional beg end)
+(defun sha1 (object &optional beg end binary)
"Return the SHA1 (Secure Hash Algorithm) of an object.
OBJECT is either a string or a buffer.
Optional arguments BEG and END denote buffer positions for computing the
-hash of a portion of OBJECT."
+hash of a portion of OBJECT.
+If BINARY is non-nil, return a string in binary form."
(if (stringp object)
- (sha1-string object)
+ (sha1-string object binary)
(save-excursion
(set-buffer object)
- (sha1-region (or beg (point-min)) (or end (point-max))))))
+ (sha1-region (or beg (point-min)) (or end (point-max)) binary))))
(provide 'sha1-el)
projects / gnus / commitdiff