OSCL/sha3
2
0
Fork 0
mirror of https://github.com/pmai/sha3.git synced 2025-12-21 23:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer handling for partial updates (fix #1).

Browse Source 
Calls to sha3-update that did not completely fill an already partially
filled buffer were handled incorrectly, in that the buffer-index wasn't
properly updated. Thanks to Orivej Desh for the bug report.
This commit is contained in:
Pierre R. Mai
2013-09-14 23:46:44 +02:00
parent 4cb18313ac
commit 9391b65603
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sha3.lisp
View File

@ -110,14 +110,19 @@ and `end', which must be numeric bounding-indices."
#.*optimize-declaration*) #.*optimize-declaration*)
;; Handle potential remaining bytes ;; Handle potential remaining bytes
(unless (zerop buffer-index) (unless (zerop buffer-index)
(let ((remainder (- (length buffer) buffer-index))) (let ((remainder (- (length buffer) buffer-index))
(declare (type fixnum remainder)) (length (- end start)))
(declare (type fixnum remainder length))
(replace buffer vector :start1 buffer-index :start2 start :end2 end) (replace buffer vector :start1 buffer-index :start2 start :end2 end)
(when (>= (- end start) remainder) ;; Return if still unfilled buffer
(keccak-state-merge-input keccak-state bit-rate buffer 0) (when (< length remainder)
(keccak-f keccak-state)) (incf (sha3-state-buffer-index state) length)
(return-from sha3-update))
;; Else handle now complete buffer
(keccak-state-merge-input keccak-state bit-rate buffer 0)
(keccak-f keccak-state)
(setf (sha3-state-buffer-index state) 0 (setf (sha3-state-buffer-index state) 0
start (min (+ start remainder) end)))) start (+ start remainder))))
;; Now handle full blocks, stuff any remainder into buffer ;; Now handle full blocks, stuff any remainder into buffer
(loop for block-offset of-type fixnum from start to end by rate-bytes (loop for block-offset of-type fixnum from start to end by rate-bytes
do do