2007-09-06 Tassilo Horn <tassilo@member.fsf.org>

	    * hmac-def.el (define-hmac-function): Switch from old-style to
	    new-style backquotes.

	    * md4.el (md4-make-step): likewise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5af55a0..a6a1fb0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -103,6 +103,13 @@
        list of groups not followed by default.  Fix type to be regexp.
        (gnus-registry-grep-in-list): Fix inverted parameters to string-match.
 
+2007-09-06  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * hmac-def.el (define-hmac-function): Switch from old-style to
+       new-style backquotes.
+
+       * md4.el (md4-make-step): likewise.
+
 2007-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-start.el (gnus-gnus-to-newsrc-format): Use a unibyte buffer and

diff --git a/lisp/hmac-def.el b/lisp/hmac-def.el
index 58fbfa6..58491ec 100644 (file)
--- a/lisp/hmac-def.el
+++ b/lisp/hmac-def.el
@@ -39,46 +39,46 @@ a string and return a digest of it (in binary form).
 B is a byte-length of a block size of H. (B=64 for both SHA1 and MD5.)
 L is a byte-length of hash outputs. (L=16 for MD5, L=20 for SHA1.)
 If BIT is non-nil, truncate output to specified bits."
-  (` (defun (, name) (text key)
-       (, (concat "Compute "
-                 (upcase (symbol-name name))
-                 " over TEXT with KEY."))
-       (let ((key-xor-ipad (make-string (, B) ?\x36))
-            (key-xor-opad (make-string (, B) ?\x5C))
-            (len (length key))
-            (pos 0))
-        (unwind-protect
-            (progn
-              ;; if `key' is longer than the block size, apply hash function
-              ;; to `key' and use the result as a real `key'.
-              (if (> len (, B))
-                  (setq key ((, H) key)
-                        len (, L)))
-              (while (< pos len)
-                (aset key-xor-ipad pos (logxor (aref key pos) ?\x36))
-                (aset key-xor-opad pos (logxor (aref key pos) ?\x5C))
-                (setq pos (1+ pos)))
-              (setq key-xor-ipad (unwind-protect
-                                     (concat key-xor-ipad text)
-                                   (fillarray key-xor-ipad 0))
-                    key-xor-ipad (unwind-protect
-                                     ((, H) key-xor-ipad)
-                                   (fillarray key-xor-ipad 0))
-                    key-xor-opad (unwind-protect
-                                     (concat key-xor-opad key-xor-ipad)
-                                   (fillarray key-xor-opad 0))
-                    key-xor-opad (unwind-protect
-                                     ((, H) key-xor-opad)
-                                   (fillarray key-xor-opad 0)))
-              ;; now `key-xor-opad' contains
-              ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)).
-              (, (if (and bit (< (/ bit 8) L))
-                     (` (substring key-xor-opad 0 (, (/ bit 8))))
-                   ;; return a copy of `key-xor-opad'.
-                   (` (concat key-xor-opad)))))
-          ;; cleanup.
-          (fillarray key-xor-ipad 0)
-          (fillarray key-xor-opad 0))))))
+  `(defun ,name (text key)
+     ,(concat "Compute "
+             (upcase (symbol-name name))
+             " over TEXT with KEY.")
+     (let ((key-xor-ipad (make-string ,B ?\x36))
+          (key-xor-opad (make-string ,B ?\x5C))
+          (len (length key))
+          (pos 0))
+       (unwind-protect
+          (progn
+            ;; if `key' is longer than the block size, apply hash function
+            ;; to `key' and use the result as a real `key'.
+            (if (> len ,B)
+                (setq key (,H key)
+                      len ,L))
+            (while (< pos len)
+              (aset key-xor-ipad pos (logxor (aref key pos) ?\x36))
+              (aset key-xor-opad pos (logxor (aref key pos) ?\x5C))
+              (setq pos (1+ pos)))
+            (setq key-xor-ipad (unwind-protect
+                                   (concat key-xor-ipad text)
+                                 (fillarray key-xor-ipad 0))
+                  key-xor-ipad (unwind-protect
+                                   (,H key-xor-ipad)
+                                 (fillarray key-xor-ipad 0))
+                  key-xor-opad (unwind-protect
+                                   (concat key-xor-opad key-xor-ipad)
+                                 (fillarray key-xor-opad 0))
+                  key-xor-opad (unwind-protect
+                                   (,H key-xor-opad)
+                                 (fillarray key-xor-opad 0)))
+            ;; now `key-xor-opad' contains
+            ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)).
+            ,(if (and bit (< (/ bit 8) L))
+                 `(substring key-xor-opad 0 ,(/ bit 8))
+               ;; return a copy of `key-xor-opad'.
+               `(concat key-xor-opad)))
+        ;; cleanup.
+        (fillarray key-xor-ipad 0)
+        (fillarray key-xor-opad 0)))))
 
 (provide 'hmac-def)
 

diff --git a/lisp/md4.el b/lisp/md4.el
index fb3cddf..aa9bc54 100644 (file)
--- a/lisp/md4.el
+++ b/lisp/md4.el
@@ -88,11 +88,10 @@ bytes long.  N is required to handle strings containing character 0."
 (defsubst md4-H (x y z) (logxor x y z))
 
 (defmacro md4-make-step (name func)
-  (`
-   (defun (, name) (a b c d xk s ac)
+  `(defun ,name (a b c d xk s ac)
      (let*
-         ((h1 (+ (car a) ((, func) (car b) (car c) (car d)) (car xk) (car ac)))
-          (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac)))
+         ((h1 (+ (car a) (,func (car b) (car c) (car d)) (car xk) (car ac)))
+          (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac)))
           (h2 (logand 65535 (+ h1 (lsh l1 -16))))
           (l2 (logand 65535 l1))
          ;; cyclic shift of 32 bits integer
@@ -102,7 +101,7 @@ bytes long.  N is required to handle strings containing character 0."
           (l3 (logand 65535 (if (> s 15)
                                 (+ (lsh l2 (- s 32)) (lsh h2 (- s 16)))
                               (+ (lsh l2 s) (lsh h2 (- s 16)))))))
-       (cons h3 l3)))))
+       (cons h3 l3))))
 
 (md4-make-step md4-round1 md4-F)
 (md4-make-step md4-round2 md4-G)