scsh-conservatory
/
sunterlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blowfish fixes - 11

This commit is contained in:
erana 2012-01-20 18:49:06 +09:00
parent 1ed85e4f95
commit 9a837da112
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scsh/encryption/blowfish.scm
View File

@ -1216,6 +1216,7 @@
(do ((i 0 (+ i 1))) (do ((i 0 (+ i 1)))
((>= i (+ blowfish-rounds 2))0) ((>= i (+ blowfish-rounds 2))0)
(dictionary-set-with-index! (blowfish-p bc) i (dictionary-ref-with-index blowfish-ps i))) (dictionary-set-with-index! (blowfish-p bc) i (dictionary-ref-with-index blowfish-ps i)))
(display "FOO")
(do ((i 0 (+ i 1))) (do ((i 0 (+ i 1)))
((>= i 256)0) ((>= i 256)0)
(dictionary-set-with-index! (blowfish-s0 bc) i (dictionary-ref-with-index blowfish-ks0 i)) (dictionary-set-with-index! (blowfish-s0 bc) i (dictionary-ref-with-index blowfish-ks0 i))
@ -1223,22 +1224,24 @@
(dictionary-set-with-index! (blowfish-s2 bc) i (dictionary-ref-with-index blowfish-ks2 i)) (dictionary-set-with-index! (blowfish-s2 bc) i (dictionary-ref-with-index blowfish-ks2 i))
(dictionary-set-with-index! (blowfish-s3 bc) i (dictionary-ref-with-index blowfish-ks3 i)) (dictionary-set-with-index! (blowfish-s3 bc) i (dictionary-ref-with-index blowfish-ks3 i))
) )
(display "FOO2")
(do ((i 0 (+ i 1)) (do ((i 0 (+ i 1))
(j 0 (+ j 1))) (j 0 (+ j 1)))
((>= i (+ blowfish-rounds 2))0) ((>= i (+ blowfish-rounds 2))0)
(if BIG-ENDIAN-HOST (if BIG-ENDIAN-HOST
(begin (begin
(dictionary-set! data 0 (vector-ref keyvec j)) (dictionary-set-with-index! data 0 (vector-ref keyvec j))
(dictionary-set! data 1 (vector-ref keyvec (remainder (+ j 1) keylen))) (dictionary-set-with-index! data 1 (vector-ref keyvec (remainder (+ j 1) keylen)))
(dictionary-set! data 2 (vector-ref keyvec (remainder (+ j 2) keylen))) (dictionary-set-with-index! data 2 (vector-ref keyvec (remainder (+ j 2) keylen)))
(dictionary-set! data 3 (vector-ref keyvec (remainder (+ j 3) keylen))) (dictionary-set-with-index! data 3 (vector-ref keyvec (remainder (+ j 3) keylen)))
) )
(begin (begin
(dictionary-set! data 3 (vector-ref keyvec j)) (dictionary-set-with-index! data 3 (vector-ref keyvec j))
(dictionary-set! data 2 (vector-ref keyvec (remainder (+ j 1) keylen))) (dictionary-set-with-index! data 2 (vector-ref keyvec (remainder (+ j 1) keylen)))
(dictionary-set! data 1 (vector-ref keyvec (remainder (+ j 2) keylen))) (dictionary-set-with-index! data 1 (vector-ref keyvec (remainder (+ j 2) keylen)))
(dictionary-set! data 0 (vector-ref keyvec (remainder (+ j 3) keylen))) (dictionary-set-with-index! data 0 (vector-ref keyvec (remainder (+ j 3) keylen)))
)) ))
(display "FOO3")
(dictionary-set-with-index! (blowfish-p bc) i (dictionary-set-with-index! (blowfish-p bc) i
(bitwise-xor (bitwise-xor
(dictionary-ref-with-index (blowfish-p bc) i) (dictionary-ref-with-index (blowfish-p bc) i)