X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Frfc2104.el;h=87eb84d12080cdc0c33a97b0b3e1d531c7c7b575;hb=348ca824b5116f395afc7d69321c3cedf60b0d3f;hp=3d459825bf250a6613691dfcb0b5daf867452e2e;hpb=a707b63af25b91cb730c12e65156ca364bf49a44;p=elisp%2Fgnus.git- diff --git a/lisp/rfc2104.el b/lisp/rfc2104.el index 3d45982..87eb84d 100644 --- a/lisp/rfc2104.el +++ b/lisp/rfc2104.el @@ -1,5 +1,7 @@ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail @@ -18,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; 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: @@ -51,7 +53,9 @@ ;;; 1999-10-23 included in pgnus ;;; 2000-08-15 `rfc2104-hexstring-to-bitstring' ;;; 2000-05-12 added sha-1 example, added test case reference - + +;;; Code: + (eval-when-compile (require 'cl)) ;; Magic character for inner HMAC round. 0x36 == 54 == '6' @@ -64,7 +68,7 @@ (defconst rfc2104-zero ?\x00) ;; Alist for converting hex to decimal. -(defconst rfc2104-hex-alist +(defconst rfc2104-hex-alist '((?0 . 0) (?a . 10) (?A . 10) (?1 . 1) (?b . 11) (?B . 11) (?2 . 2) (?c . 12) (?C . 12) @@ -93,7 +97,7 @@ (defun rfc2104-hash (hash block-length hash-length key text) (let* (;; if key is longer than B, reset it to HASH(key) - (key (if (> (length key) block-length) + (key (if (> (length key) block-length) (funcall hash key) key)) (k_ipad (append key nil)) (k_opad (append key nil)))