Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 13:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing typo in final serialization of sha2 for 2+ chunks.

Browse source 
Fixes issue #215.
This commit is contained in:
Alex Shinn 2014-04-16 21:03:08 +09:00
parent 9788e40f0d
commit d33744b17d
2 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/chibi/crypto/sha2.scm
View file

@ -137,39 +137,25 @@
s1))))) s1)))))
;; Compression function main loop: ;; Compression function main loop:
(let lp ((j 0) (let lp ((j 0)
(a h0) (a h0) (b h1)
(b h1) (c h2) (d h3)
(c h2) (e h4) (f h5)
(d h3) (g h6) (h h7))
(e h4)
(f h5)
(g h6)
(h h7))
(cond (cond
((= j 64) ((= j 64)
;; Repeat on next block. (let ((a (u32+ h0 a)) (b (u32+ h1 b))
(cond (c (u32+ h2 c)) (d (u32+ h3 d))
((< n 64) (e (u32+ h4 e)) (f (u32+ h5 f))
(if (>= n 56) (g (u32+ h6 g)) (h (u32+ h7 h)))
(chunk (+ i n) 0 (cond
(u32+ h0 a) (u32+ h1 b) (u32+ h2 c) (u32+ h3 d) ((< n 64)
(u32+ h4 e) (u32+ h5 f) (u32+ h6 g) (u32+ h7 h)) (if (>= n 56)
;; Done - add back in the has inits and serialize. (chunk (+ i n) 0 a b c d e f g h)
(string-append (string-append
(hex (u32+ a (vector-ref inits 0))) (hex a) (hex b) (hex c) (hex d)
(hex (u32+ b (vector-ref inits 1))) (hex e) (hex f) (hex g) (if full? (hex h) ""))))
(hex (u32+ c (vector-ref inits 2))) (else
(hex (u32+ d (vector-ref inits 3))) (chunk (+ i 64) pad a b c d e f g h)))))
(hex (u32+ e (vector-ref inits 4)))
(hex (u32+ f (vector-ref inits 5)))
(hex (u32+ g (vector-ref inits 6)))
(if full?
(hex (u32+ h #x5be0cd19))
""))))
(else
(chunk (+ i 64) pad
(u32+ h0 a) (u32+ h1 b) (u32+ h2 c) (u32+ h3 d)
(u32+ h4 e) (u32+ h5 f) (u32+ h6 g) (u32+ h7 h)))))
(else (else
;; Step - compute the two sigmas and recurse on the new a-h. ;; Step - compute the two sigmas and recurse on the new a-h.
(let* ((s1 (bitwise-xor (bitwise-rot-u32 e 6) (let* ((s1 (bitwise-xor (bitwise-rot-u32 e 6)

4
tests/sha-tests.scm
View file

@ -16,5 +16,9 @@
(sha-256 "abc")) (sha-256 "abc"))
(test "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592" (test "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592"
(sha-256 "The quick brown fox jumps over the lazy dog")) (sha-256 "The quick brown fox jumps over the lazy dog"))
(test "61f8fe4c4cdc8b3e10673933fcd0c5b1f6b46d3392550e42b265daefc7bc0d31"
(sha-256 "abcdbcdecdefdefgefghfghighijhijkijkljklmklm"))
(test "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1"
(sha-256 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"))
(test-end) (test-end)