;;; Code:
-(defconst canlock-version "0.8")
-
(eval-when-compile
(require 'cl))
:type 'boolean
:group 'canlock)
-(eval-when-compile
- (defmacro canlock-string-as-unibyte (string)
- "Return a unibyte string with the same individual bytes as STRING."
- (if (fboundp 'string-as-unibyte)
- (list 'string-as-unibyte string)
- string)))
-
(defun canlock-sha1-with-openssl (message)
"Make a SHA-1 digest of MESSAGE using OpenSSL."
(let (default-enable-multibyte-characters)
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 (concat "\\\\x" (match-string 0))))
+ (while (re-search-forward "\\([0-9a-f][0-9a-f]\\)" nil t)
+ (replace-match "\\\\x\\1"))
(insert "\"")
(goto-char (point-min))
- (canlock-string-as-unibyte (read (current-buffer)))))))
-
-(defvar canlock-read-passwd nil)
-(defun canlock-read-passwd (prompt &rest args)
- "Read a password using PROMPT.
-If ARGS, PROMPT is used as an argument to `format'."
- (let ((prompt
- (if args
- (apply 'format prompt args)
- prompt)))
- (unless canlock-read-passwd
- (if (or (fboundp 'read-passwd) (load "passwd" t))
- (setq canlock-read-passwd 'read-passwd)
- (unless (fboundp 'ange-ftp-read-passwd)
- (autoload 'ange-ftp-read-passwd "ange-ftp"))
- (setq canlock-read-passwd 'ange-ftp-read-passwd)))
- (funcall canlock-read-passwd prompt)))
+ (read (current-buffer))))))
+
+(eval-when-compile
+ (defmacro canlock-string-as-unibyte (string)
+ "Return a unibyte string with the same individual bytes as STRING."
+ (if (fboundp 'string-as-unibyte)
+ (list 'string-as-unibyte string)
+ 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)))
(defun canlock-make-cancel-key (message-id password)
"Make a Cancel-Key header."
- (cond ((> (length password) 20)
- (setq password (funcall canlock-sha1-function password)))
- ((< (length password) 20)
- (setq password (concat
- password
- (make-string (- 20 (length password)) 0)))))
- (setq password (concat password (make-string 44 0)))
- (let ((ipad (mapconcat (lambda (char)
- (char-to-string (logxor 54 char)))
+ (when (> (length password) 20)
+ (setq password (canlock-sha1 password)))
+ (setq password (concat password (make-string (- 64 (length password)) 0)))
+ (let ((ipad (mapconcat (lambda (byte)
+ (char-to-string (logxor 54 byte)))
password ""))
- (opad (mapconcat (lambda (char)
- (char-to-string (logxor 92 char)))
+ (opad (mapconcat (lambda (byte)
+ (char-to-string (logxor 92 byte)))
password "")))
(base64-encode-string
- (funcall canlock-sha1-function
- (concat
- opad
- (funcall canlock-sha1-function
- (concat ipad
- (canlock-string-as-unibyte message-id))))))))
+ (canlock-sha1
+ (concat opad
+ (canlock-sha1
+ (concat ipad (canlock-string-as-unibyte message-id))))))))
(defun canlock-narrow-to-header ()
"Narrow the buffer to the head of the message."
(message "There are no Message-ID(s)")
(unless password
(setq password (or canlock-password
- (canlock-read-passwd
+ (read-passwd
"Password for Canlock: "))))
(if (or (not (stringp password)) (zerop (length password)))
(message "Password for Canlock is bad")
(insert "Cancel-Key: sha1:" key-for-key "\n"))
(when key-for-lock
(insert "Cancel-Lock: sha1:"
- (base64-encode-string (funcall canlock-sha1-function
- key-for-lock))
+ (base64-encode-string (canlock-sha1 key-for-lock))
"\n")))))))))
;;;###autoload
(error "%s" errmsg))
(setq password (or canlock-password-for-verify
- (canlock-read-passwd "Password for Canlock: ")))
+ (read-passwd "Password for Canlock: ")))
(if (or (not (stringp password)) (zerop (length password)))
(progn
(setq errmsg "Password for Canlock is bad")
(when locks
(when id-for-lock
(setq key-for-lock
- (base64-encode-string (funcall canlock-sha1-function
- (canlock-make-cancel-key
- id-for-lock password))))
+ (base64-encode-string
+ (canlock-sha1 (canlock-make-cancel-key id-for-lock
+ password))))
(when (and locks (not match))
(setq match (string-equal key-for-lock (pop locks)))))
(setq locks (if match "good" "bad")))