X-Git-Url: http://git.kpe.io/?p=md5.git;a=blobdiff_plain;f=md5.lisp;h=a0d4b9e9171e1c0ee2ac750bb3c025b53ec68323;hp=ce85d8e477c955ea7f42dfdc411f8178ba64fd11;hb=HEAD;hpb=a48b188987129763f5b6eaf13c28c1c94aa451c2

diff --git a/md5.lisp b/md5.lisp
index ce85d8e..a0d4b9e 100644
--- a/md5.lisp
+++ b/md5.lisp
@@ -5,8 +5,6 @@
 ;;;; cmucl-help mailing-list hosted at cons.org, in November 2001 and
 ;;;; has been placed into the public domain.
 ;;;;
-;;;; $Id: md5.lisp,v 1.2 2002/11/11 11:17:56 kevin Exp $
-;;;;
 ;;;; While the implementation should work on all conforming Common
 ;;;; Lisp implementations, it has only been optimized for CMU CL,
 ;;;; where it achieved comparable performance to the standard md5sum
@@ -31,6 +29,8 @@
 ;;;; *features* prior to compilation.  In that case evaluating
 ;;;; (md5::test-rfc1321) will run all the test-cases present in
 ;;;; Appendix A.5 of RFC 1321 and report on the results.
+;;;; Evaluating (md5::test-other) will run further test-cases
+;;;; gathered by the author to cover regressions, etc.
 ;;;;
 ;;;; This software is "as is", and has no warranty of any kind.  The
 ;;;; authors assume no responsibility for the consequences of any use
@@ -61,42 +61,49 @@
 
 ;;; Section 2:  Basic Datatypes
 
+#-lispworks
 (eval-when (:compile-toplevel :load-toplevel :execute)
+  (deftype ub32 ()
+    "Corresponds to the 32bit quantity word of the MD5 Spec"
+    `(unsigned-byte 32)))
+
+#+lispworks
 (deftype ub32 ()
-  "Corresponds to the 32bit quantity word of the MD5 Spec"
-  `(unsigned-byte 32)))
+    "Corresponds to the 32bit quantity word of the MD5 Spec"
+    `(unsigned-byte 32))
 
-(defmacro assemble-ub32 (a b c d)
-  "Assemble an ub32 value from the given (unsigned-byte 8) values,
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defmacro assemble-ub32 (a b c d)
+    "Assemble an ub32 value from the given (unsigned-byte 8) values,
 where a is the intended low-order byte and d the high-order byte."
-  `(the ub32 (logior (ash ,d 24) (ash ,c 16) (ash ,b 8) ,a)))
+    `(the ub32 (logior (ash ,d 24) (ash ,c 16) (ash ,b 8) ,a))))
 
 ;;; Section 3.4:  Auxilliary functions
 
 (declaim (inline f g h i)
-	 (ftype (function (ub32 ub32 ub32) ub32) f g h i))
+         (ftype (function (ub32 ub32 ub32) ub32) f g h i))
 
 (defun f (x y z)
   (declare (type ub32 x y z)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+cmu
   (kernel:32bit-logical-or (kernel:32bit-logical-and x y)
-			   (kernel:32bit-logical-andc1 x z))
+                           (kernel:32bit-logical-andc1 x z))
   #-cmu
   (logior (logand x y) (logandc1 x z)))
 
 (defun g (x y z)
   (declare (type ub32 x y z)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+cmu
   (kernel:32bit-logical-or (kernel:32bit-logical-and x z)
-			   (kernel:32bit-logical-andc2 y z))
+                           (kernel:32bit-logical-andc2 y z))
   #-cmu
   (logior (logand x z) (logandc2 y z)))
 
 (defun h (x y z)
   (declare (type ub32 x y z)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+cmu
   (kernel:32bit-logical-xor x (kernel:32bit-logical-xor y z))
   #-cmu
@@ -104,14 +111,14 @@ where a is the intended low-order byte and d the high-order byte."
 
 (defun i (x y z)
   (declare (type ub32 x y z)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+cmu
   (kernel:32bit-logical-xor y (kernel:32bit-logical-orc2 x z))
   #-cmu
-  (logxor y (logorc2 x z)))
+  (ldb (byte 32 0) (logxor y (logorc2 x z))))
 
 (declaim (inline mod32+)
-	 (ftype (function (ub32 ub32) ub32) mod32+))
+         (ftype (function (ub32 ub32) ub32) mod32+))
 (defun mod32+ (a b)
   (declare (type ub32 a b) (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   (ldb (byte 32 0) (+ a b)))
@@ -121,14 +128,14 @@ where a is the intended low-order byte and d the high-order byte."
   `(ext:truly-the ub32 (+ ,a ,b)))
 
 (declaim (inline rol32)
-	 (ftype (function (ub32 (unsigned-byte 5)) ub32) rol32))
+         (ftype (function (ub32 (unsigned-byte 5)) ub32) rol32))
 (defun rol32 (a s)
   (declare (type ub32 a) (type (unsigned-byte 5) s)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+cmu
   (kernel:32bit-logical-or #+little-endian (kernel:shift-towards-end a s)
-			   #+big-endian (kernel:shift-towards-start a s)
-			   (ash a (- s 32)))
+                           #+big-endian (kernel:shift-towards-start a s)
+                           (ash a (- s 32)))
   #-cmu
   (logior (ldb (byte 32 0) (ash a s)) (ash a (- s 32))))
 
@@ -136,25 +143,25 @@ where a is the intended low-order byte and d the high-order byte."
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *t* (make-array 64 :element-type 'ub32
-				:initial-contents
-				(loop for i from 1 to 64
-				      collect
-				      (truncate
-				       (* 4294967296
-					  (abs (sin (float i 0.0d0)))))))))
+                                :initial-contents
+                                (loop for i from 1 to 64
+                                      collect
+                                      (truncate
+                                       (* 4294967296
+                                          (abs (sin (float i 0.0d0)))))))))
 
 ;;; Section 3.4:  Helper Macro for single round definitions
 
 (defmacro with-md5-round ((op block) &rest clauses)
   (loop for (a b c d k s i) in clauses
-	collect
-	`(setq ,a (mod32+ ,b (rol32 (mod32+ (mod32+ ,a (,op ,b ,c ,d))
-					    (mod32+ (aref ,block ,k)
-						    ,(aref *t* (1- i))))
-			            ,s)))
-	into result
-	finally
-	(return `(progn ,@result))))
+        collect
+        `(setq ,a (mod32+ ,b (rol32 (mod32+ (mod32+ ,a (,op ,b ,c ,d))
+                                            (mod32+ (aref ,block ,k)
+                                                    ,(aref *t* (1- i))))
+                                    ,s)))
+        into result
+        finally
+        (return `(progn ,@result))))
 
 ;;; Section 3.3:  (Initial) MD5 Working Set
 
@@ -191,9 +198,9 @@ registers A, B, C and D."
   (let ((regs (make-array 4 :element-type '(unsigned-byte 32))))
     (declare (type md5-regs regs))
     (setf (md5-regs-a regs) +md5-magic-a+
-	  (md5-regs-b regs) +md5-magic-b+
-	  (md5-regs-c regs) +md5-magic-c+
-	  (md5-regs-d regs) +md5-magic-d+)
+          (md5-regs-b regs) +md5-magic-b+
+          (md5-regs-c regs) +md5-magic-c+
+          (md5-regs-d regs) +md5-magic-d+)
     regs))
 
 ;;; Section 3.4:  Operation on 16-Word Blocks
@@ -203,11 +210,11 @@ registers A, B, C and D."
 word block of input, and updates the working state in A, B, C, and D
 accordingly."
   (declare (type md5-regs regs)
-	   (type (simple-array ub32 (16)) block)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
-  (let ((a (md5-regs-a regs)) (b (md5-regs-b regs))
-	(c (md5-regs-c regs)) (d (md5-regs-d regs)))
-    (declare (type ub32 a b c d))
+           (type (simple-array ub32 (16)) block)
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+  (let ((A (md5-regs-a regs)) (B (md5-regs-b regs))
+        (C (md5-regs-c regs)) (D (md5-regs-d regs)))
+    (declare (type ub32 A B C D))
     ;; Round 1
     (with-md5-round (f block)
       (A B C D  0  7  1)(D A B C  1 12  2)(C D A B  2 17  3)(B C D A  3 22  4)
@@ -233,37 +240,23 @@ accordingly."
       (A B C D  8  6 57)(D A B C 15 10 58)(C D A B  6 15 59)(B C D A 13 21 60)
       (A B C D  4  6 61)(D A B C 11 10 62)(C D A B  2 15 63)(B C D A  9 21 64))
     ;; Update and return
-    (setf (md5-regs-a regs) (mod32+ (md5-regs-a regs) a)
-	  (md5-regs-b regs) (mod32+ (md5-regs-b regs) b)
-	  (md5-regs-c regs) (mod32+ (md5-regs-c regs) c)
-	  (md5-regs-d regs) (mod32+ (md5-regs-d regs) d))
+    (setf (md5-regs-a regs) (mod32+ (md5-regs-a regs) A)
+          (md5-regs-b regs) (mod32+ (md5-regs-b regs) B)
+          (md5-regs-c regs) (mod32+ (md5-regs-c regs) C)
+          (md5-regs-d regs) (mod32+ (md5-regs-d regs) D))
     regs))
 
 ;;; Section 3.4:  Converting 8bit-vectors into 16-Word Blocks
 
 (declaim (inline fill-block fill-block-ub8 fill-block-char))
-(defun fill-block (block buffer offset)
-  "Convert a complete 64 byte input vector segment into the given 16
-word MD5 block.  This currently works on (unsigned-byte 8) and
-character simple-arrays, via the functions `fill-block-ub8' and
-`fill-block-char' respectively."
-  (declare (type (integer 0 #.(- most-positive-fixnum 64)) offset)
-	   (type (simple-array ub32 (16)) block)
-	   (type (simple-array * (*)) buffer)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
-  (etypecase buffer
-    ((simple-array (unsigned-byte 8) (*))
-     (fill-block-ub8 block buffer offset))
-    (simple-string
-     (fill-block-char block buffer offset))))
 
 (defun fill-block-ub8 (block buffer offset)
   "Convert a complete 64 (unsigned-byte 8) input vector segment
 starting from offset into the given 16 word MD5 block."
   (declare (type (integer 0 #.(- most-positive-fixnum 64)) offset)
-	   (type (simple-array ub32 (16)) block)
-	   (type (simple-array (unsigned-byte 8) (*)) buffer)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (type (simple-array ub32 (16)) block)
+           (type (simple-array (unsigned-byte 8) (*)) buffer)
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+(and :cmu :little-endian)
   (kernel:bit-bash-copy
    buffer (+ (* vm:vector-data-offset vm:word-bits) (* offset vm:byte-bits))
@@ -271,22 +264,22 @@ starting from offset into the given 16 word MD5 block."
    (* 64 vm:byte-bits))
   #-(and :cmu :little-endian)
   (loop for i of-type (integer 0 16) from 0
-	for j of-type (integer 0 #.most-positive-fixnum)
-	from offset to (+ offset 63) by 4
-	do
-	(setf (aref block i)
-	      (assemble-ub32 (aref buffer j)
-			     (aref buffer (+ j 1))
-			     (aref buffer (+ j 2))
-			     (aref buffer (+ j 3))))))
+        for j of-type (integer 0 #.most-positive-fixnum)
+        from offset to (+ offset 63) by 4
+        do
+        (setf (aref block i)
+              (assemble-ub32 (aref buffer j)
+                             (aref buffer (+ j 1))
+                             (aref buffer (+ j 2))
+                             (aref buffer (+ j 3))))))
 
 (defun fill-block-char (block buffer offset)
   "Convert a complete 64 character input string segment starting from
 offset into the given 16 word MD5 block."
   (declare (type (integer 0 #.(- most-positive-fixnum 64)) offset)
-	   (type (simple-array ub32 (16)) block)
-	   (type simple-string buffer)
-	   (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+           (type (simple-array ub32 (16)) block)
+           (type simple-string buffer)
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
   #+(and :cmu :little-endian)
   (kernel:bit-bash-copy
    buffer (+ (* vm:vector-data-offset vm:word-bits) (* offset vm:byte-bits))
@@ -294,14 +287,29 @@ offset into the given 16 word MD5 block."
    (* 64 vm:byte-bits))
   #-(and :cmu :little-endian)
   (loop for i of-type (integer 0 16) from 0
-	for j of-type (integer 0 #.most-positive-fixnum)
-	from offset to (+ offset 63) by 4
-	do
-	(setf (aref block i)
-	      (assemble-ub32 (char-code (schar buffer j))
-			     (char-code (schar buffer (+ j 1)))
-			     (char-code (schar buffer (+ j 2)))
-			     (char-code (schar buffer (+ j 3)))))))
+        for j of-type (integer 0 #.most-positive-fixnum)
+        from offset to (+ offset 63) by 4
+        do
+        (setf (aref block i)
+              (assemble-ub32 (char-code (schar buffer j))
+                             (char-code (schar buffer (+ j 1)))
+                             (char-code (schar buffer (+ j 2)))
+                             (char-code (schar buffer (+ j 3)))))))
+
+(defun fill-block (block buffer offset)
+  "Convert a complete 64 byte input vector segment into the given 16
+word MD5 block.  This currently works on (unsigned-byte 8) and
+character simple-arrays, via the functions `fill-block-ub8' and
+`fill-block-char' respectively."
+  (declare (type (integer 0 #.(- most-positive-fixnum 64)) offset)
+           (type (simple-array ub32 (16)) block)
+           (type (simple-array * (*)) buffer)
+           (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+  (etypecase buffer
+    ((simple-array (unsigned-byte 8) (*))
+     (fill-block-ub8 block buffer offset))
+    (simple-string
+     (fill-block-char block buffer offset))))
 
 ;;; Section 3.5:  Message Digest Output
 
@@ -310,18 +318,18 @@ offset into the given 16 word MD5 block."
   "Create the final 16 byte message-digest from the MD5 working state
 in regs.  Returns a (simple-array (unsigned-byte 8) (16))."
   (declare (optimize (speed 3) (safety 0) (space 0) (debug 0))
-	   (type md5-regs regs))
+           (type md5-regs regs))
   (let ((result (make-array 16 :element-type '(unsigned-byte 8))))
     (declare (type (simple-array (unsigned-byte 8) (16)) result))
     (macrolet ((frob (reg offset)
-		 (let ((var (gensym)))
-		   `(let ((,var ,reg))
-		      (declare (type ub32 ,var))
-		      (setf
-		       (aref result ,offset) (ldb (byte 8 0) ,var)
-		       (aref result ,(+ offset 1)) (ldb (byte 8 8) ,var)
-		       (aref result ,(+ offset 2)) (ldb (byte 8 16) ,var)
-		       (aref result ,(+ offset 3)) (ldb (byte 8 24) ,var))))))
+                 (let ((var (gensym)))
+                   `(let ((,var ,reg))
+                      (declare (type ub32 ,var))
+                      (setf
+                       (aref result ,offset) (ldb (byte 8 0) ,var)
+                       (aref result ,(+ offset 1)) (ldb (byte 8 8) ,var)
+                       (aref result ,(+ offset 2)) (ldb (byte 8 16) ,var)
+                       (aref result ,(+ offset 3)) (ldb (byte 8 24) ,var))))))
       (frob (md5-regs-a regs) 0)
       (frob (md5-regs-b regs) 4)
       (frob (md5-regs-c regs) 8)
@@ -331,16 +339,16 @@ in regs.  Returns a (simple-array (unsigned-byte 8) (16))."
 ;;; Mid-Level Drivers
 
 (defstruct (md5-state
-	     (:constructor make-md5-state ())
-	     (:copier))
+             (:constructor make-md5-state ())
+             (:copier))
   (regs (initial-md5-regs) :type md5-regs :read-only t)
   (amount 0 :type
-	  #-md5-small-length (integer 0 *)
-	  #+md5-small-length (unsigned-byte 29))
+          #-md5-small-length (integer 0 *)
+          #+md5-small-length (unsigned-byte 29))
   (block (make-array 16 :element-type '(unsigned-byte 32)) :read-only t
-	 :type (simple-array (unsigned-byte 32) (16)))
+         :type (simple-array (unsigned-byte 32) (16)))
   (buffer (make-array 64 :element-type '(unsigned-byte 8)) :read-only t
-	 :type (simple-array (unsigned-byte 8) (64)))
+         :type (simple-array (unsigned-byte 8) (64)))
   (buffer-index 0 :type (integer 0 63))
   (finalized-p nil))
 
@@ -350,96 +358,108 @@ in regs.  Returns a (simple-array (unsigned-byte 8) (16))."
 from-offset and copying count elements into the 64 byte buffer
 starting at buffer-offset."
   (declare (optimize (speed 3) (safety 0) (space 0) (debug 0))
-	   (type (unsigned-byte 29) from-offset)
-	   (type (integer 0 63) count buffer-offset)
-	   (type (simple-array * (*)) from)
-	   (type (simple-array (unsigned-byte 8) (64)) buffer))
+           (type (unsigned-byte 29) from-offset)
+           (type (integer 0 63) count buffer-offset)
+           (type (simple-array * (*)) from)
+           (type (simple-array (unsigned-byte 8) (64)) buffer))
   #+cmu
   (kernel:bit-bash-copy
    from (+ (* vm:vector-data-offset vm:word-bits) (* from-offset vm:byte-bits))
    buffer (+ (* vm:vector-data-offset vm:word-bits)
-	     (* buffer-offset vm:byte-bits))
+             (* buffer-offset vm:byte-bits))
    (* count vm:byte-bits))
   #-cmu
   (etypecase from
     (simple-string
      (loop for buffer-index of-type (integer 0 64) from buffer-offset
-	   for from-index of-type fixnum from from-offset
-	   below (+ from-offset count)
-	   do
-	   (setf (aref buffer buffer-index)
-		 (char-code (schar (the simple-string from) from-index)))))
+           for from-index of-type fixnum from from-offset
+           below (+ from-offset count)
+           do
+           (setf (aref buffer buffer-index)
+                 (char-code (schar (the simple-string from) from-index)))))
     ((simple-array (unsigned-byte 8) (*))
      (loop for buffer-index of-type (integer 0 64) from buffer-offset
-	   for from-index of-type fixnum from from-offset
-	   below (+ from-offset count)
-	   do
-	   (setf (aref buffer buffer-index)
-		 (aref (the (simple-array (unsigned-byte 8) (*)) from)
-		       from-index))))))
+           for from-index of-type fixnum from from-offset
+           below (+ from-offset count)
+           do
+           (setf (aref buffer buffer-index)
+                 (aref (the (simple-array (unsigned-byte 8) (*)) from)
+                       from-index))))))
 
 (defun update-md5-state (state sequence &key (start 0) (end (length sequence)))
   "Update the given md5-state from sequence, which is either a
 simple-string or a simple-array with element-type (unsigned-byte 8),
 bounded by start and end, which must be numeric bounding-indices."
   (declare (type md5-state state)
-	   (type (simple-array * (*)) sequence)
-	   (type fixnum start end)
-	   (optimize (speed 3) #+cmu (safety 0) (space 0) (debug 0))
-	   #+cmu
-	   (ext:optimize-interface (safety 1) (debug 1)))
+           (type (simple-array * (*)) sequence)
+           (type fixnum start end)
+           (optimize (speed 3) #+cmu (safety 0) (space 0) (debug 0))
+           #+cmu
+           (ext:optimize-interface (safety 1) (debug 1)))
   (let ((regs (md5-state-regs state))
-	(block (md5-state-block state))
-	(buffer (md5-state-buffer state))
-	(buffer-index (md5-state-buffer-index state))
-	(length (- end start)))
-    (declare (type md5-regs regs) (type fixnum length)
-	     (type (integer 0 63) buffer-index)
-	     (type (simple-array (unsigned-byte 32) (16)) block)
-	     (type (simple-array (unsigned-byte 8) (64)) buffer))
+        (block (md5-state-block state))
+        (buffer (md5-state-buffer state)))
+    (declare (type md5-regs regs)
+             (type (simple-array (unsigned-byte 32) (16)) block)
+             (type (simple-array (unsigned-byte 8) (64)) buffer))
     ;; Handle old rest
-    (unless (zerop buffer-index)
-      (let ((amount (min (- 64 buffer-index) length)))
-	(declare (type (integer 0 63) amount))
-	(copy-to-buffer sequence start amount buffer buffer-index)
-	(setq start (the fixnum (+ start amount)))
-	(when (>= start end)
-	  (setf (md5-state-buffer-index state) (+ buffer-index amount))
-	  (return-from update-md5-state state)))
-      (fill-block-ub8 block buffer 0)
-      (update-md5-block regs block))
+    (unless (zerop (md5-state-buffer-index state))
+      (let* ((buffer-index (md5-state-buffer-index state))
+             (remainder (- 64 buffer-index))
+             (length (- end start))
+             (amount (min remainder length)))
+        (declare (type (integer 0 63) buffer-index remainder amount)
+                 (type fixnum length))
+        (copy-to-buffer sequence start amount buffer buffer-index)
+        (setf (md5-state-amount state)
+              #-md5-small-length (+ (md5-state-amount state) amount)
+              #+md5-small-length (the (unsigned-byte 29)
+                                      (+ (md5-state-amount state) amount)))
+        (setq start (the fixnum (+ start amount)))
+        (if (< length remainder)
+            (setf (md5-state-buffer-index state)
+                  (the (integer 0 63) (+ buffer-index amount)))
+          (progn
+            (fill-block-ub8 block buffer 0)
+            (update-md5-block regs block)
+            (setf (md5-state-buffer-index state) 0)))))
+    ;; Leave when nothing to do
+    (when (>= start end)
+      (return-from update-md5-state state))
     ;; Handle main-part and new-rest
     (etypecase sequence
       ((simple-array (unsigned-byte 8) (*))
        (locally
-	   (declare (type (simple-array (unsigned-byte 8) (*)) sequence))
-	 (loop for offset of-type (unsigned-byte 29) from start below end by 64
-	       until (< (- end offset) 64)
-	       do
-	       (fill-block-ub8 block sequence offset)
-	       (update-md5-block regs block)
-	       finally
-	       (let ((amount (- end offset)))
-		 (unless (zerop amount)
-		   (copy-to-buffer sequence offset amount buffer 0))
-		 (setf (md5-state-buffer-index state) amount)))))
+           (declare (type (simple-array (unsigned-byte 8) (*)) sequence))
+         (loop for offset of-type (unsigned-byte 29) from start below end by 64
+               until (< (- end offset) 64)
+               do
+               (fill-block-ub8 block sequence offset)
+               (update-md5-block regs block)
+               finally
+               (let ((amount (- end offset)))
+                 (unless (zerop amount)
+                   (copy-to-buffer sequence offset amount buffer 0))
+                 (setf (md5-state-buffer-index state) amount)))))
       (simple-string
        (locally
-	   (declare (type simple-string sequence))
-	 (loop for offset of-type (unsigned-byte 29) from start below end by 64
-	       until (< (- end offset) 64)
-	       do
-	       (fill-block-char block sequence offset)
-	       (update-md5-block regs block)
-	       finally
-	       (let ((amount (- end offset)))
-		 (unless (zerop amount)
-		   (copy-to-buffer sequence offset amount buffer 0))
-		 (setf (md5-state-buffer-index state) amount))))))
+           (declare (type simple-string sequence))
+         (loop for offset of-type (unsigned-byte 29) from start below end by 64
+               until (< (- end offset) 64)
+               do
+               (fill-block-char block sequence offset)
+               (update-md5-block regs block)
+               finally
+               (let ((amount (- end offset)))
+                 (unless (zerop amount)
+                   (copy-to-buffer sequence offset amount buffer 0))
+                 (setf (md5-state-buffer-index state) amount))))))
     (setf (md5-state-amount state)
-	  #-md5-small-length (+ (md5-state-amount state) length)
-	  #+md5-small-length (the (unsigned-byte 29)
-			       (+ (md5-state-amount state) length)))
+          #-md5-small-length (+ (md5-state-amount state)
+                                (the fixnum (- end start)))
+          #+md5-small-length (the (unsigned-byte 29)
+                               (+ (md5-state-amount state)
+                                  (the fixnum (- end start)))))
     state))
 
 (defun finalize-md5-state (state)
@@ -451,38 +471,41 @@ The resulting MD5 message-digest is returned as an array of sixteen
 (unsigned-byte 8) values.  Calling `update-md5-state' after a call to
 `finalize-md5-state' results in unspecified behaviour."
   (declare (type md5-state state)
-	   (optimize (speed 3) #+cmu (safety 0) (space 0) (debug 0))
-	   #+cmu
-	   (ext:optimize-interface (safety 1) (debug 1)))
+           (optimize (speed 3) #+cmu (safety 0) (space 0) (debug 0))
+           #+cmu
+           (ext:optimize-interface (safety 1) (debug 1)))
   (or (md5-state-finalized-p state)
       (let ((regs (md5-state-regs state))
-	    (block (md5-state-block state))
-	    (buffer (md5-state-buffer state))
-	    (buffer-index (md5-state-buffer-index state))
-	    (total-length (* 8 (md5-state-amount state))))
-	(declare (type md5-regs regs)
-		 (type (integer 0 63) buffer-index)
-		 (type (simple-array ub32 (16)) block)
-		 (type (simple-array (unsigned-byte 8) (*)) buffer))
-	(setf (aref buffer buffer-index) #x80)
-	(loop for index of-type (integer 0 64)
-	      from (1+ buffer-index) below 64
-	      do (setf (aref buffer index) #x00))
-	(fill-block-ub8 block buffer 0)
-	(when (< buffer-index 56)
-	  (setf (aref block 14) (ldb (byte 32 0) total-length))
-	  #-md5-small-length
-	  (setf (aref block 15) (ldb (byte 32 32) total-length)))
-	(update-md5-block regs block)
-	(when (< 56 buffer-index 64)
-	  (loop for index of-type (integer 0 16) from 0 below 16
-		do (setf (aref block index) #x00000000))
-	  (setf (aref block 14) (ldb (byte 32 0) total-length))
-	  #-md5-small-length
-	  (setf (aref block 15) (ldb (byte 32 32) total-length))
-	  (update-md5-block regs block))
-	(setf (md5-state-finalized-p state)
-	      (md5regs-digest regs)))))
+            (block (md5-state-block state))
+            (buffer (md5-state-buffer state))
+            (buffer-index (md5-state-buffer-index state))
+            (total-length (* 8 (md5-state-amount state))))
+        (declare (type md5-regs regs)
+                 (type (integer 0 63) buffer-index)
+                 (type (simple-array ub32 (16)) block)
+                 (type (simple-array (unsigned-byte 8) (*)) buffer))
+        ;; Add mandatory bit 1 padding
+        (setf (aref buffer buffer-index) #x80)
+        ;; Fill with 0 bit padding
+        (loop for index of-type (integer 0 64)
+              from (1+ buffer-index) below 64
+              do (setf (aref buffer index) #x00))
+        (fill-block-ub8 block buffer 0)
+        ;; Flush block first if length wouldn't fit
+        (when (>= buffer-index 56)
+          (update-md5-block regs block)
+          ;; Create new fully 0 padded block
+          (loop for index of-type (integer 0 16) from 0 below 16
+                do (setf (aref block index) #x00000000)))
+        ;; Add 64bit message bit length
+        (setf (aref block 14) (ldb (byte 32 0) total-length))
+        #-md5-small-length
+        (setf (aref block 15) (ldb (byte 32 32) total-length))
+        ;; Flush last block
+        (update-md5-block regs block)
+        ;; Done, remember digest for later calls
+        (setf (md5-state-finalized-p state)
+              (md5regs-digest regs)))))
 
 ;;; High-Level Drivers
 
@@ -492,7 +515,7 @@ this works for all sequences whose element-type is supported by the
 underlying MD5 routines, on other implementations it only works for 1d
 simple-arrays with such element types."
   (declare (optimize (speed 3) (space 0) (debug 0))
-	   (type vector sequence) (type fixnum start))
+           (type vector sequence) (type fixnum start))
   (let ((state (make-md5-state)))
     (declare (type md5-state state))
     #+cmu
@@ -505,8 +528,8 @@ simple-arrays with such element types."
     (finalize-md5-state state)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-(defconstant +buffer-size+ (* 128 1024)
-  "Size of internal buffer to use for md5sum-stream and md5sum-file
+  (defconstant +buffer-size+ (* 128 1024)
+    "Size of internal buffer to use for md5sum-stream and md5sum-file
 operations.  This should be a multiple of 64, the MD5 block size."))
 
 (deftype buffer-index () `(integer 0 ,+buffer-size+))
@@ -520,25 +543,25 @@ element-type has to be either (unsigned-byte 8) or character."
     (cond
       ((equal (stream-element-type stream) '(unsigned-byte 8))
        (let ((buffer (make-array +buffer-size+
-				 :element-type '(unsigned-byte 8))))
-	 (declare (type (simple-array (unsigned-byte 8) (#.+buffer-size+))
-			buffer))
-	 (loop for bytes of-type buffer-index = (read-sequence buffer stream)
-	       do (update-md5-state state buffer :end bytes)
-	       until (< bytes +buffer-size+)
-	       finally
-	       (return (finalize-md5-state state)))))
+                                 :element-type '(unsigned-byte 8))))
+         (declare (type (simple-array (unsigned-byte 8) (#.+buffer-size+))
+                        buffer))
+         (loop for bytes of-type buffer-index = (read-sequence buffer stream)
+               do (update-md5-state state buffer :end bytes)
+               until (< bytes +buffer-size+)
+               finally
+               (return (finalize-md5-state state)))))
       ((equal (stream-element-type stream) 'character)
        (let ((buffer (make-string +buffer-size+)))
-	 (declare (type (simple-string #.+buffer-size+) buffer))
-	 (loop for bytes of-type buffer-index = (read-sequence buffer stream)
-	       do (update-md5-state state buffer :end bytes)
-	       until (< bytes +buffer-size+)
-	       finally
-	       (return (finalize-md5-state state)))))
+         (declare (type (simple-string #.+buffer-size+) buffer))
+         (loop for bytes of-type buffer-index = (read-sequence buffer stream)
+               do (update-md5-state state buffer :end bytes)
+               until (< bytes +buffer-size+)
+               finally
+               (return (finalize-md5-state state)))))
       (t
        (error "Unsupported stream element-type ~S for stream ~S."
-	      (stream-element-type stream) stream)))))
+              (stream-element-type stream) stream)))))
 
 (defun md5sum-file (pathname)
   "Calculate the MD5 message-digest of the file specified by pathname."
@@ -561,27 +584,149 @@ element-type has to be either (unsigned-byte 8) or character."
 according to the test suite in Appendix A.5 of RFC 1321")
 
 #+md5-testing
-(defun test-rfc1321 ()
+(defconstant +other-testsuite+
+  '(;; From padding bug report by Edi Weitz
+    ("1631901HERR BUCHHEISTERCITROEN NORD1043360796beckenbauer" .
+     "d734945e5930bb28859ccd13c830358b")
+    ;; Test padding for strings from 0 to 69*8 bits in size.
+    ("" . "d41d8cd98f00b204e9800998ecf8427e")
+    ("a" . "0cc175b9c0f1b6a831c399e269772661")
+    ("aa" . "4124bc0a9335c27f086f24ba207a4912")
+    ("aaa" . "47bce5c74f589f4867dbd57e9ca9f808")
+    ("aaaa" . "74b87337454200d4d33f80c4663dc5e5")
+    ("aaaaa" . "594f803b380a41396ed63dca39503542")
+    ("aaaaaa" . "0b4e7a0e5fe84ad35fb5f95b9ceeac79")
+    ("aaaaaaa" . "5d793fc5b00a2348c3fb9ab59e5ca98a")
+    ("aaaaaaaa" . "3dbe00a167653a1aaee01d93e77e730e")
+    ("aaaaaaaaa" . "552e6a97297c53e592208cf97fbb3b60")
+    ("aaaaaaaaaa" . "e09c80c42fda55f9d992e59ca6b3307d")
+    ("aaaaaaaaaaa" . "d57f21e6a273781dbf8b7657940f3b03")
+    ("aaaaaaaaaaaa" . "45e4812014d83dde5666ebdf5a8ed1ed")
+    ("aaaaaaaaaaaaa" . "c162de19c4c3731ca3428769d0cd593d")
+    ("aaaaaaaaaaaaaa" . "451599a5f9afa91a0f2097040a796f3d")
+    ("aaaaaaaaaaaaaaa" . "12f9cf6998d52dbe773b06f848bb3608")
+    ("aaaaaaaaaaaaaaaa" . "23ca472302f49b3ea5592b146a312da0")
+    ("aaaaaaaaaaaaaaaaa" . "88e42e96cc71151b6e1938a1699b0a27")
+    ("aaaaaaaaaaaaaaaaaa" . "2c60c24e7087e18e45055a33f9a5be91")
+    ("aaaaaaaaaaaaaaaaaaa" . "639d76897485360b3147e66e0a8a3d6c")
+    ("aaaaaaaaaaaaaaaaaaaa" . "22d42eb002cefa81e9ad604ea57bc01d")
+    ("aaaaaaaaaaaaaaaaaaaaa" . "bd049f221af82804c5a2826809337c9b")
+    ("aaaaaaaaaaaaaaaaaaaaaa" . "ff49cfac3968dbce26ebe7d4823e58bd")
+    ("aaaaaaaaaaaaaaaaaaaaaaa" . "d95dbfee231e34cccb8c04444412ed7d")
+    ("aaaaaaaaaaaaaaaaaaaaaaaa" . "40edae4bad0e5bf6d6c2dc5615a86afb")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaa" . "a5a8bfa3962f49330227955e24a2e67c")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaa" . "ae791f19bdf77357ff10bb6b0e97e121")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaa" . "aaab9c59a88bf0bdfcb170546c5459d6")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "b0f0545856af1a340acdedce23c54b97")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "f7ce3d7d44f3342107d884bfa90c966a")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "59e794d45697b360e18ba972bada0123")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "3b0845db57c200be6052466f87b2198a")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "5eca9bd3eb07c006cd43ae48dfde7fd3")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "b4f13cb081e412f44e99742cb128a1a5")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" . "4c660346451b8cf91ef50f4634458d41")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "11db24dc3f6c2145701db08625dd6d76")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "80dad3aad8584778352c68ab06250327")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "1227fe415e79db47285cb2689c93963f")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "8e084f489f1bdf08c39f98ff6447ce6d")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "08b2f2b0864bac1ba1585043362cbec9")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "4697843037d962f62a5a429e611e0f5f")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "10c4da18575c092b486f8ab96c01c02f")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "af205d729450b663f48b11d839a1c8df")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "0d3f91798fac6ee279ec2485b25f1124")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "4c3c7c067634daec9716a80ea886d123")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "d1e358e6e3b707282cdd06e919f7e08c")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "8c6ded4f0af86e0a7e301f8a716c4363")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "4c2d8bcb02d982d7cb77f649c0a2dea8")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "bdb662f765cd310f2a547cab1cfecef6")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "08ff5f7301d30200ab89169f6afdb7af")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "6eb6a030bcce166534b95bc2ab45d9cf")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "1bb77918e5695c944be02c16ae29b25e")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "b6fe77c19f0f0f4946c761d62585bfea")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "e9e7e260dce84ffa6e0e7eb5fd9d37fc")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "eced9e0b81ef2bba605cbc5e2e76a1d0")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "ef1772b6dff9a122358552954ad0df65")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "3b0c8ac703f828b04c6c197006d17218")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "652b906d60af96844ebd21b674f35e93")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "dc2f2f2462a0d72358b2f99389458606")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "762fc2665994b217c52c3c2eb7d9f406")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "cc7ed669cf88f201c3297c6a91e1d18d")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "cced11f7bbbffea2f718903216643648")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "24612f0ce2c9d2cf2b022ef1e027a54f")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "b06521f39153d618550606be297466d5")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "014842d480b571495a4a0363793f7367")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "c743a45e0d2e6a95cb859adae0248435")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "def5d97e01e1219fb2fc8da6c4d6ba2f")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "92cb737f8687ccb93022fdb411a77cca")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "a0d1395c7fb36247bfe2d49376d9d133")
+    ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" .
+     "ab75504250558b788f99d1ebd219abf2"))
+  "AList of test input strings and stringified message-digests
+according to my additional test suite")
+
+#+md5-testing
+(defun test-with-testsuite (testsuite)
   (loop for count from 1
-	for (source . md5-string) in +rfc1321-testsuite+
-	for md5-digest = (md5sum-sequence source)
-	for md5-result-string = (format nil "~(~{~2,'0X~}~)"
-					(map 'list #'identity md5-digest))
-	do
-	(format
-	 *trace-output*
-	 "~2&Test-Case ~D:~%  Input: ~S~%  Required: ~A~%  Returned: ~A~%"
-	 count source md5-string md5-result-string)
-	when (string= md5-string md5-result-string)
-	do (format *trace-output* "  OK~%")
-	else
-	count 1 into failed
-	and do (format *trace-output* "  FAILED~%")
-	finally
-	(format *trace-output*
-		"~2&~[All ~D test cases succeeded~:;~:*~D of ~D test cases failed~].~%"
-		failed (1- count))
-	(return (zerop failed))))
+        for (source . md5-string) in testsuite
+        for md5-digest = (md5sum-sequence source)
+        for md5-result-string = (format nil "~(~{~2,'0X~}~)"
+                                        (map 'list #'identity md5-digest))
+        do
+        (format
+         *trace-output*
+         "~2&Test-Case ~D:~%  Input: ~S~%  Required: ~A~%  Returned: ~A~%"
+         count source md5-string md5-result-string)
+        when (string= md5-string md5-result-string)
+        do (format *trace-output* "  OK~%")
+        else
+        count 1 into failed
+        and do (format *trace-output* "  FAILED~%")
+        finally
+        (format *trace-output*
+                "~2&~[All ~D test cases succeeded~:;~:*~D of ~D test cases failed~].~%"
+                failed (1- count))
+        (return (zerop failed))))
+
+#+md5-testing
+(defun test-rfc1321 ()
+  (test-with-testsuite +rfc1321-testsuite+))
+
+#+md5-testing
+(defun test-other ()
+  (test-with-testsuite +other-testsuite+))
 
 #+cmu
 (eval-when (:compile-toplevel :execute)