upstream fix for update-md5-state

2 files changed, 72 insertions, 0 deletions

diff --git a/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1 b/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1
new file mode 100644
index 000000000000..c66763ac239e
--- /dev/null
+++ b/dev-lisp/cl-md5/files/digest-cl-md5-1.8.1-r1
@@ -0,0 +1 @@
+MD5 f13319f74363289f7b7e02ab70467a44 cl-md5_1.8.1.orig.tar.gz 8932
diff --git a/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch b/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch
new file mode 100644
index 000000000000..8e72f40e7207
--- /dev/null
+++ b/dev-lisp/cl-md5/files/md5-1.8-mai-gentoo.patch
@@ -0,0 +1,71 @@
+Index: md5.lisp
+===================================================================
+RCS file: /prj/EXPORT/pubcvs/PMSF/CLASH/src/md5.lisp,v
+retrieving revision 1.8
+diff -u -r1.8 md5.lisp
+--- md5.lisp	25 Jan 2003 00:18:27 -0000	1.8
++++ md5.lisp	3 Nov 2003 22:28:34 -0000
+@@ -391,24 +391,34 @@
+ 	   (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)
++	(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) (*))
+@@ -438,9 +448,11 @@
+ 		   (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 (+ (md5-state-amount state) 
++                                (the fixnum (- end start)))
+ 	  #+md5-small-length (the (unsigned-byte 29)
+-			       (+ (md5-state-amount state) length)))
++			       (+ (md5-state-amount state) 
++                                  (the fixnum (- end start)))))
+     state))
+ 
+ (defun finalize-md5-state (state)