]> gitweb.factorcode.org Git - factor.git/commitdiff
move sha1 and sha2 to checksums.sha, update usages
authorDoug Coleman <erg@jobim.local>
Sun, 17 May 2009 22:58:36 +0000 (17:58 -0500)
committerDoug Coleman <erg@jobim.local>
Sun, 17 May 2009 22:58:36 +0000 (17:58 -0500)
20 files changed:
basis/checksums/hmac/hmac-tests.factor
basis/checksums/hmac/hmac.factor
basis/checksums/interleave/interleave-tests.factor
basis/checksums/openssl/openssl-docs.factor
basis/checksums/sha/authors.txt [new file with mode: 0755]
basis/checksums/sha/sha-docs.factor [new file with mode: 0644]
basis/checksums/sha/sha-tests.factor [new file with mode: 0644]
basis/checksums/sha/sha.factor [new file with mode: 0644]
basis/checksums/sha/summary.txt [new file with mode: 0644]
basis/checksums/sha2/authors.txt [deleted file]
basis/checksums/sha2/sha2-docs.factor [deleted file]
basis/checksums/sha2/sha2-tests.factor [deleted file]
basis/checksums/sha2/sha2.factor [deleted file]
basis/checksums/sha2/summary.txt [deleted file]
basis/furnace/auth/auth-docs.factor
basis/furnace/auth/auth.factor
basis/uuid/uuid.factor
core/checksums/checksums-docs.factor
extra/benchmark/sha1/sha1.factor
extra/ecdsa/ecdsa-tests.factor

index 02dfc271a497233845607a169dad171ee848bdf6..ffae146614e840fdafe0f98783fd10167f9edd10 100755 (executable)
@@ -1,5 +1,5 @@
 USING: kernel io strings byte-arrays sequences namespaces math
-parser checksums.hmac tools.test checksums.md5 checksums.sha2
+parser checksums.hmac tools.test checksums.md5 checksums.sha
 checksums ;
 IN: checksums.hmac.tests
 
@@ -46,4 +46,3 @@ IN: checksums.hmac.tests
     "JefeJefeJefeJefeJefeJefeJefeJefe"
     "what do ya want for nothing?" sha-256 hmac-bytes hex-string
 ] unit-test
-
index 538dfc92c81ef9fdd32162e8513f9ad9498db986..b163766016a33be55a0be16b0f0ee1253d9ef4e1 100755 (executable)
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays checksums checksums.md5 checksums.md5.private
-checksums.sha1 combinators fry io io.binary io.encodings.binary
-io.files io.streams.byte-array kernel math math.vectors memoize
-sequences locals accessors ;
+USING: accessors arrays checksums combinators fry io io.binary
+io.encodings.binary io.files io.streams.byte-array kernel
+locals math math.vectors memoize sequences ;
 IN: checksums.hmac
 
 <PRIVATE
index 14dddaafab16b8fc6115b54fe0260829eb28d8ba..9a66e5e3168e1b910d1db39da5568064081f4798 100644 (file)
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test checksums.interleave checksums.sha2 ;
+USING: tools.test checksums.interleave checksums.sha ;
 IN: checksums.interleave.tests
 
 [
index b0cc8f9e539524b96e76201ffa4d182f6643654a..27df72c4eac491a9e82d41c7dcec6ebebfc3476d 100644 (file)
@@ -32,6 +32,6 @@ ARTICLE: "checksums.openssl" "OpenSSL checksums"
 "An example where we compute the SHA1 checksum of a string using the OpenSSL implementation of SHA1:"
 { $example "USING: byte-arrays checksums checksums.openssl ;" "\"hello world\" >byte-array openssl-sha1 checksum-bytes hex-string ." "\"2aae6c35c94fcfb415dbe95f408b9ce91ee846ed\"" }
 "If we use the Factor implementation, we get the same result, just slightly slower:"
-{ $example "USING: byte-arrays checksums checksums.sha1 ;" "\"hello world\" >byte-array sha1 checksum-bytes hex-string ." "\"2aae6c35c94fcfb415dbe95f408b9ce91ee846ed\"" } ;
+{ $example "USING: byte-arrays checksums checksums.sha ;" "\"hello world\" >byte-array sha1 checksum-bytes hex-string ." "\"2aae6c35c94fcfb415dbe95f408b9ce91ee846ed\"" } ;
 
 ABOUT: "checksums.openssl"
diff --git a/basis/checksums/sha/authors.txt b/basis/checksums/sha/authors.txt
new file mode 100755 (executable)
index 0000000..7c1b2f2
--- /dev/null
@@ -0,0 +1 @@
+Doug Coleman
diff --git a/basis/checksums/sha/sha-docs.factor b/basis/checksums/sha/sha-docs.factor
new file mode 100644 (file)
index 0000000..780c2b3
--- /dev/null
@@ -0,0 +1,18 @@
+USING: help.markup help.syntax ;
+IN: checksums.sha
+
+HELP: sha-224
+{ $class-description "SHA-224 checksum algorithm." } ;
+
+HELP: sha-256
+{ $class-description "SHA-256 checksum algorithm." } ;
+
+ARTICLE: "checksums.sha" "SHA-2 checksum"
+"The SHA family of checksum algorithms are one-way hashes useful for checksumming data. SHA-1 is considered insecure, while SHA-2 It is generally considered to be pretty strong." $nl
+"SHA-2 checksums:"
+{ $subsection sha-224 }
+{ $subsection sha-256 }
+"SHA-1 checksum:"
+{ $subsection sha1 } ;
+
+ABOUT: "checksums.sha"
diff --git a/basis/checksums/sha/sha-tests.factor b/basis/checksums/sha/sha-tests.factor
new file mode 100644 (file)
index 0000000..b70b5e7
--- /dev/null
@@ -0,0 +1,47 @@
+USING: arrays kernel math namespaces sequences tools.test
+checksums.sha checksums ;
+IN: checksums.sha.tests
+
+: test-checksum ( text identifier -- checksum )
+    checksum-bytes hex-string ;
+
+[ "a9993e364706816aba3e25717850c26c9cd0d89d" ] [ "abc" sha1 checksum-bytes hex-string ] unit-test
+[ "84983e441c3bd26ebaae4aa1f95129e5e54670f1" ] [ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" sha1 checksum-bytes hex-string ] unit-test
+! [ "34aa973cd4c4daa4f61eeb2bdbad27316534016f" ] [ 1000000 CHAR: a fill string>sha1str ] unit-test ! takes a long time...
+[ "dea356a2cddd90c7a7ecedc5ebb563934f460452" ] [ "0123456701234567012345670123456701234567012345670123456701234567"
+10 swap <array> concat sha1 checksum-bytes hex-string ] unit-test
+
+
+[ "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525" ]
+[
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+    sha-224 test-checksum
+] unit-test
+
+[ "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ]
+[ "" sha-256 test-checksum ] unit-test
+
+[ "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" ]
+[ "abc" sha-256 test-checksum ] unit-test
+
+[ "f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650" ]
+[ "message digest" sha-256 test-checksum ] unit-test
+
+[ "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73" ]
+[ "abcdefghijklmnopqrstuvwxyz" sha-256 test-checksum ] unit-test
+
+[ "db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0" ]
+[
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+    sha-256 test-checksum
+] unit-test
+
+[ "f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e" ]
+[
+    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+    sha-256 test-checksum
+] unit-test
+
+
+! [ "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909" ]
+! [ "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" sha-512 test-checksum ] unit-test
diff --git a/basis/checksums/sha/sha.factor b/basis/checksums/sha/sha.factor
new file mode 100644 (file)
index 0000000..287c39b
--- /dev/null
@@ -0,0 +1,411 @@
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel splitting grouping math sequences namespaces make
+io.binary math.bitwise checksums checksums.common
+sbufs strings combinators.smart math.ranges fry combinators
+accessors locals checksums.stream multiline literals
+generalizations ;
+IN: checksums.sha
+
+SINGLETON: sha1
+INSTANCE: sha1 stream-checksum
+
+SINGLETON: sha-224
+SINGLETON: sha-256
+
+INSTANCE: sha-224 stream-checksum
+INSTANCE: sha-256 stream-checksum
+
+TUPLE: sha1-state < checksum-state K H W word-size ;
+
+CONSTANT: initial-H-sha1
+    { 
+        HEX: 67452301
+        HEX: efcdab89
+        HEX: 98badcfe
+        HEX: 10325476
+        HEX: c3d2e1f0
+    }
+
+CONSTANT: K-sha1
+    $[
+        20 HEX: 5a827999 <repetition>
+        20 HEX: 6ed9eba1 <repetition>
+        20 HEX: 8f1bbcdc <repetition>
+        20 HEX: ca62c1d6 <repetition> 
+        4 { } nappend-as
+    ]
+
+TUPLE: sha2-state < checksum-state K H word-size ;
+
+TUPLE: sha2-short < sha2-state ;
+
+TUPLE: sha2-long < sha2-state ;
+
+TUPLE: sha-224-state < sha2-short ;
+
+TUPLE: sha-256-state < sha2-short ;
+
+M: sha2-state clone
+    call-next-method
+    [ clone ] change-H
+    [ clone ] change-K ;
+
+<PRIVATE
+
+CONSTANT: a 0
+CONSTANT: b 1
+CONSTANT: c 2
+CONSTANT: d 3
+CONSTANT: e 4
+CONSTANT: f 5
+CONSTANT: g 6
+CONSTANT: h 7
+
+CONSTANT: initial-H-224
+    {
+        HEX: c1059ed8 HEX: 367cd507 HEX: 3070dd17 HEX: f70e5939
+        HEX: ffc00b31 HEX: 68581511 HEX: 64f98fa7 HEX: befa4fa4
+    }
+
+CONSTANT: initial-H-256
+    {
+        HEX: 6a09e667 HEX: bb67ae85 HEX: 3c6ef372 HEX: a54ff53a
+        HEX: 510e527f HEX: 9b05688c HEX: 1f83d9ab HEX: 5be0cd19
+    }
+
+CONSTANT: initial-H-384
+    {
+        HEX: cbbb9d5dc1059ed8
+        HEX: 629a292a367cd507
+        HEX: 9159015a3070dd17
+        HEX: 152fecd8f70e5939
+        HEX: 67332667ffc00b31
+        HEX: 8eb44a8768581511
+        HEX: db0c2e0d64f98fa7
+        HEX: 47b5481dbefa4fa4
+    }
+
+CONSTANT: initial-H-512
+    {
+        HEX: 6a09e667f3bcc908
+        HEX: bb67ae8584caa73b
+        HEX: 3c6ef372fe94f82b
+        HEX: a54ff53a5f1d36f1
+        HEX: 510e527fade682d1
+        HEX: 9b05688c2b3e6c1f
+        HEX: 1f83d9abfb41bd6b
+        HEX: 5be0cd19137e2179
+    }
+
+CONSTANT: K-256
+    {
+        HEX: 428a2f98 HEX: 71374491 HEX: b5c0fbcf HEX: e9b5dba5
+        HEX: 3956c25b HEX: 59f111f1 HEX: 923f82a4 HEX: ab1c5ed5
+        HEX: d807aa98 HEX: 12835b01 HEX: 243185be HEX: 550c7dc3
+        HEX: 72be5d74 HEX: 80deb1fe HEX: 9bdc06a7 HEX: c19bf174
+        HEX: e49b69c1 HEX: efbe4786 HEX: 0fc19dc6 HEX: 240ca1cc
+        HEX: 2de92c6f HEX: 4a7484aa HEX: 5cb0a9dc HEX: 76f988da
+        HEX: 983e5152 HEX: a831c66d HEX: b00327c8 HEX: bf597fc7
+        HEX: c6e00bf3 HEX: d5a79147 HEX: 06ca6351 HEX: 14292967
+        HEX: 27b70a85 HEX: 2e1b2138 HEX: 4d2c6dfc HEX: 53380d13
+        HEX: 650a7354 HEX: 766a0abb HEX: 81c2c92e HEX: 92722c85
+        HEX: a2bfe8a1 HEX: a81a664b HEX: c24b8b70 HEX: c76c51a3
+        HEX: d192e819 HEX: d6990624 HEX: f40e3585 HEX: 106aa070
+        HEX: 19a4c116 HEX: 1e376c08 HEX: 2748774c HEX: 34b0bcb5
+        HEX: 391c0cb3 HEX: 4ed8aa4a HEX: 5b9cca4f HEX: 682e6ff3
+        HEX: 748f82ee HEX: 78a5636f HEX: 84c87814 HEX: 8cc70208
+        HEX: 90befffa HEX: a4506ceb HEX: bef9a3f7 HEX: c67178f2
+    }
+
+CONSTANT: K-384
+    {
+
+        HEX: 428a2f98d728ae22 HEX: 7137449123ef65cd HEX: b5c0fbcfec4d3b2f HEX: e9b5dba58189dbbc 
+        HEX: 3956c25bf348b538 HEX: 59f111f1b605d019 HEX: 923f82a4af194f9b HEX: ab1c5ed5da6d8118 
+        HEX: d807aa98a3030242 HEX: 12835b0145706fbe HEX: 243185be4ee4b28c HEX: 550c7dc3d5ffb4e2
+        HEX: 72be5d74f27b896f HEX: 80deb1fe3b1696b1 HEX: 9bdc06a725c71235 HEX: c19bf174cf692694 
+        HEX: e49b69c19ef14ad2 HEX: efbe4786384f25e3 HEX: 0fc19dc68b8cd5b5 HEX: 240ca1cc77ac9c65 
+        HEX: 2de92c6f592b0275 HEX: 4a7484aa6ea6e483 HEX: 5cb0a9dcbd41fbd4 HEX: 76f988da831153b5 
+        HEX: 983e5152ee66dfab HEX: a831c66d2db43210 HEX: b00327c898fb213f HEX: bf597fc7beef0ee4 
+        HEX: c6e00bf33da88fc2 HEX: d5a79147930aa725 HEX: 06ca6351e003826f HEX: 142929670a0e6e70 
+        HEX: 27b70a8546d22ffc HEX: 2e1b21385c26c926 HEX: 4d2c6dfc5ac42aed HEX: 53380d139d95b3df 
+        HEX: 650a73548baf63de HEX: 766a0abb3c77b2a8 HEX: 81c2c92e47edaee6 HEX: 92722c851482353b 
+        HEX: a2bfe8a14cf10364 HEX: a81a664bbc423001 HEX: c24b8b70d0f89791 HEX: c76c51a30654be30 
+        HEX: d192e819d6ef5218 HEX: d69906245565a910 HEX: f40e35855771202a HEX: 106aa07032bbd1b8 
+        HEX: 19a4c116b8d2d0c8 HEX: 1e376c085141ab53 HEX: 2748774cdf8eeb99 HEX: 34b0bcb5e19b48a8 
+        HEX: 391c0cb3c5c95a63 HEX: 4ed8aa4ae3418acb HEX: 5b9cca4f7763e373 HEX: 682e6ff3d6b2b8a3 
+        HEX: 748f82ee5defb2fc HEX: 78a5636f43172f60 HEX: 84c87814a1f0ab72 HEX: 8cc702081a6439ec 
+        HEX: 90befffa23631e28 HEX: a4506cebde82bde9 HEX: bef9a3f7b2c67915 HEX: c67178f2e372532b 
+        HEX: ca273eceea26619c HEX: d186b8c721c0c207 HEX: eada7dd6cde0eb1e HEX: f57d4f7fee6ed178 
+        HEX: 06f067aa72176fba HEX: 0a637dc5a2c898a6 HEX: 113f9804bef90dae HEX: 1b710b35131c471b 
+        HEX: 28db77f523047d84 HEX: 32caab7b40c72493 HEX: 3c9ebe0a15c9bebc HEX: 431d67c49c100d4c 
+        HEX: 4cc5d4becb3e42b6 HEX: 597f299cfc657e2a HEX: 5fcb6fab3ad6faec HEX: 6c44198c4a475817
+    }
+
+ALIAS: K-512 K-384
+
+: <sha1-state> ( -- sha1-state )
+    sha1-state new-checksum-state
+        64 >>block-size
+        K-sha1 >>K
+        initial-H-sha1 >>H
+        4 >>word-size ;
+
+: <sha-224-state> ( -- sha2-state )
+    sha-224-state new-checksum-state
+        64 >>block-size
+        K-256 >>K
+        initial-H-224 >>H
+        4 >>word-size ;
+
+: <sha-256-state> ( -- sha2-state )
+    sha-256-state new-checksum-state
+        64 >>block-size
+        K-256 >>K
+        initial-H-256 >>H
+        4 >>word-size ;
+
+M: sha1 initialize-checksum-state drop <sha1-state> ;
+
+M: sha-224 initialize-checksum-state drop <sha-224-state> ;
+
+M: sha-256 initialize-checksum-state drop <sha-256-state> ;
+
+: s0-256 ( x -- x' )
+    [
+        [ -7 bitroll-32 ]
+        [ -18 bitroll-32 ]
+        [ -3 shift ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: s1-256 ( x -- x' )
+    [
+        [ -17 bitroll-32 ]
+        [ -19 bitroll-32 ]
+        [ -10 shift ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: S0-256 ( x -- x' )
+    [
+        [ -2 bitroll-32 ]
+        [ -13 bitroll-32 ]
+        [ -22 bitroll-32 ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: S1-256 ( x -- x' )
+    [
+        [ -6 bitroll-32 ]
+        [ -11 bitroll-32 ]
+        [ -25 bitroll-32 ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: s0-512 ( x -- x' )
+    [
+        [ -1 bitroll-64 ]
+        [ -8 bitroll-64 ]
+        [ -7 shift ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: s1-512 ( x -- x' )
+    [
+        [ -19 bitroll-64 ]
+        [ -61 bitroll-64 ]
+        [ -6 shift ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: S0-512 ( x -- x' )
+    [
+        [ -28 bitroll-64 ]
+        [ -34 bitroll-64 ]
+        [ -39 bitroll-64 ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: S1-512 ( x -- x' )
+    [
+        [ -14 bitroll-64 ]
+        [ -18 bitroll-64 ]
+        [ -41 bitroll-64 ] tri
+    ] [ bitxor ] reduce-outputs ; inline
+
+: prepare-M-256 ( n seq -- )
+    {
+        [ [ 16 - ] dip nth ]
+        [ [ 15 - ] dip nth s0-256 ]
+        [ [ 7 - ] dip nth ]
+        [ [ 2 - ] dip nth s1-256 w+ w+ w+ ]
+        [ ]
+    } 2cleave set-nth ; inline
+
+: prepare-M-512 ( n seq -- )
+    {
+        [ [ 16 - ] dip nth ]
+        [ [ 15 - ] dip nth s0-512 ]
+        [ [ 7 - ] dip nth ]
+        [ [ 2 - ] dip nth s1-512 w+ w+ w+ ]
+        [ ]
+    } 2cleave set-nth ; inline
+
+: ch ( x y z -- x' )
+    [ bitxor bitand ] keep bitxor ; inline
+
+: maj ( x y z -- x' )
+    [ [ bitand ] [ bitor ] 2bi ] dip bitand bitor ; inline
+
+: slice3 ( n seq -- a b c )
+    [ dup 3 + ] dip <slice> first3 ; inline
+
+GENERIC: pad-initial-bytes ( string sha2 -- padded-string )
+
+:: T1-256 ( n M H sha2 -- T1 )
+    n M nth
+    n sha2 K>> nth +
+    e H slice3 ch w+
+    e H nth S1-256 w+
+    h H nth w+ ; inline
+
+: T2-256 ( H -- T2 )
+    [ a swap nth S0-256 ]
+    [ a swap slice3 maj w+ ] bi ; inline
+
+:: T1-512 ( n M H sha2 -- T1 )
+    n M nth
+    n sha2 K>> nth +
+    e H slice3 ch w+
+    e H nth S1-512 w+
+    h H nth w+ ; inline
+
+: T2-512 ( H -- T2 )
+    [ a swap nth S0-512 ]
+    [ a swap slice3 maj w+ ] bi ; inline
+
+: update-H ( T1 T2 H -- )
+    h g pick exchange
+    g f pick exchange
+    f e pick exchange
+    pick d pick nth w+ e pick set-nth
+    d c pick exchange
+    c b pick exchange
+    b a pick exchange
+    [ w+ a ] dip set-nth ; inline
+
+: prepare-message-schedule ( seq sha2 -- w-seq )
+    [ word-size>> <sliced-groups> [ be> ] map ]
+    [
+        block-size>> [ 0 pad-tail 16 ] keep [a,b) over
+        '[ _ prepare-M-256 ] each
+    ] bi ; inline
+
+:: process-chunk ( M block-size cloned-H sha2 -- )
+    block-size [
+        M cloned-H sha2 T1-256
+        cloned-H T2-256
+        cloned-H update-H
+    ] each
+    sha2 [ cloned-H [ w+ ] 2map ] change-H drop ; inline
+
+M: sha2-short checksum-block
+    [ prepare-message-schedule ]
+    [ [ block-size>> ] [ H>> clone ] [ ] tri process-chunk ] bi ;
+
+: seq>byte-array ( seq n -- string )
+    '[ _ >be ] map B{ } join ;
+
+: sha1>checksum ( sha2 -- bytes )
+    H>> 4 seq>byte-array ;
+
+: sha-224>checksum ( sha2 -- bytes )
+    H>> 7 head 4 seq>byte-array ;
+
+: sha-256>checksum ( sha2 -- bytes )
+    H>> 4 seq>byte-array ;
+
+: pad-last-short-block ( state -- )
+    [ bytes>> t ] [ bytes-read>> pad-last-block ] [ ] tri
+    [ checksum-block ] curry each ;
+
+PRIVATE>
+
+M: sha-224-state get-checksum
+    clone
+    [ pad-last-short-block ] [ sha-224>checksum ] bi ;
+
+M: sha-256-state get-checksum
+    clone
+    [ pad-last-short-block ] [ sha-256>checksum ] bi ;
+
+M: sha-224 checksum-stream ( stream checksum -- byte-array )
+    drop
+    [ <sha-224-state> ] dip add-checksum-stream get-checksum ;
+
+M: sha-256 checksum-stream ( stream checksum -- byte-array )
+    drop
+    [ <sha-256-state> ] dip add-checksum-stream get-checksum ;
+
+
+
+: sha1-W ( t seq -- )
+    {
+        [ [ 3 - ] dip nth ]
+        [ [ 8 - ] dip nth bitxor ]
+        [ [ 14 - ] dip nth bitxor ]
+        [ [ 16 - ] dip nth bitxor 1 bitroll-32 ]
+        [ ]
+    } 2cleave set-nth ;
+
+: prepare-sha1-message-schedule ( seq -- w-seq )
+    4 <sliced-groups> [ be> ] map
+    80 0 pad-tail 16 80 [a,b) over
+    '[ _ sha1-W ] each ; inline
+
+: sha1-f ( B C D n -- f_nbcd )
+    20 /i
+    {
+        { 0 [ [ over bitnot ] dip bitand [ bitand ] dip bitor ] }
+        { 1 [ bitxor bitxor ] }
+        { 2 [ 2dup bitand [ pick bitand [ bitand ] dip ] dip bitor bitor ] }
+        { 3 [ bitxor bitxor ] }
+    } case ;
+
+:: inner-loop ( n H W K -- temp )
+    a H nth :> A
+    b H nth :> B
+    c H nth :> C
+    d H nth :> D
+    e H nth :> E
+    [
+        A 5 bitroll-32
+
+        B C D n sha1-f 
+
+        E
+
+        n K nth
+
+        n W nth
+    ] sum-outputs 32 bits ;
+
+:: process-sha1-chunk ( bytes H W K state -- )
+    80 [
+        H W K inner-loop
+        d H nth e H set-nth
+        c H nth d H set-nth
+        b H nth 30 bitroll-32 c H set-nth
+        a H nth b H set-nth
+        a H set-nth
+    ] each
+    state [ H [ w+ ] 2map ] change-H drop ; inline
+
+M:: sha1-state checksum-block ( bytes state -- )
+    bytes prepare-sha1-message-schedule state (>>W)
+
+    bytes
+    state [ H>> clone ] [ W>> ] [ K>> ] tri state process-sha1-chunk ;
+
+M: sha1-state get-checksum
+    clone
+    [ pad-last-short-block ] [ sha-256>checksum ] bi ;
+
+M: sha1 checksum-stream ( stream checksum -- byte-array )
+    drop
+    [ <sha1-state> ] dip add-checksum-stream get-checksum ;
diff --git a/basis/checksums/sha/summary.txt b/basis/checksums/sha/summary.txt
new file mode 100644 (file)
index 0000000..2dd351a
--- /dev/null
@@ -0,0 +1 @@
+SHA checksum algorithms
diff --git a/basis/checksums/sha2/authors.txt b/basis/checksums/sha2/authors.txt
deleted file mode 100755 (executable)
index 7c1b2f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Doug Coleman
diff --git a/basis/checksums/sha2/sha2-docs.factor b/basis/checksums/sha2/sha2-docs.factor
deleted file mode 100644 (file)
index 6a12855..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-USING: help.markup help.syntax ;
-IN: checksums.sha2
-
-HELP: sha-256
-{ $class-description "SHA-256 checksum algorithm." } ;
-
-ARTICLE: "checksums.sha2" "SHA2 checksum"
-"The SHA2 checksum algorithm implements a one-way hash function. It is generally considered to be pretty strong."
-{ $subsection sha-256 } ;
-
-ABOUT: "checksums.sha2"
diff --git a/basis/checksums/sha2/sha2-tests.factor b/basis/checksums/sha2/sha2-tests.factor
deleted file mode 100644 (file)
index fa01796..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-USING: arrays kernel math namespaces sequences tools.test
-checksums.sha2 checksums ;
-IN: checksums.sha2.tests
-
-: test-checksum ( text identifier -- checksum )
-    checksum-bytes hex-string ;
-
-[ "a9993e364706816aba3e25717850c26c9cd0d89d" ] [ "abc" sha1 checksum-bytes hex-string ] unit-test
-[ "84983e441c3bd26ebaae4aa1f95129e5e54670f1" ] [ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" sha1 checksum-bytes hex-string ] unit-test
-! [ "34aa973cd4c4daa4f61eeb2bdbad27316534016f" ] [ 1000000 CHAR: a fill string>sha1str ] unit-test ! takes a long time...
-[ "dea356a2cddd90c7a7ecedc5ebb563934f460452" ] [ "0123456701234567012345670123456701234567012345670123456701234567"
-10 swap <array> concat sha1 checksum-bytes hex-string ] unit-test
-
-
-[ "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525" ]
-[
-    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-    sha-224 test-checksum
-] unit-test
-
-[ "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ]
-[ "" sha-256 test-checksum ] unit-test
-
-[ "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" ]
-[ "abc" sha-256 test-checksum ] unit-test
-
-[ "f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650" ]
-[ "message digest" sha-256 test-checksum ] unit-test
-
-[ "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73" ]
-[ "abcdefghijklmnopqrstuvwxyz" sha-256 test-checksum ] unit-test
-
-[ "db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0" ]
-[
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-    sha-256 test-checksum
-] unit-test
-
-[ "f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e" ]
-[
-    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    sha-256 test-checksum
-] unit-test
-
-
-! [ "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909" ]
-! [ "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu" sha-512 test-checksum ] unit-test
diff --git a/basis/checksums/sha2/sha2.factor b/basis/checksums/sha2/sha2.factor
deleted file mode 100644 (file)
index 6c799d7..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-! Copyright (C) 2008 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel splitting grouping math sequences namespaces make
-io.binary math.bitwise checksums checksums.common
-sbufs strings combinators.smart math.ranges fry combinators
-accessors locals checksums.stream multiline literals
-generalizations ;
-IN: checksums.sha2
-
-SINGLETON: sha1
-INSTANCE: sha1 stream-checksum
-
-SINGLETON: sha-224
-SINGLETON: sha-256
-
-INSTANCE: sha-224 stream-checksum
-INSTANCE: sha-256 stream-checksum
-
-TUPLE: sha1-state < checksum-state K H W word-size ;
-
-CONSTANT: initial-H-sha1
-    { 
-        HEX: 67452301
-        HEX: efcdab89
-        HEX: 98badcfe
-        HEX: 10325476
-        HEX: c3d2e1f0
-    }
-
-CONSTANT: K-sha1
-    $[
-        20 HEX: 5a827999 <repetition>
-        20 HEX: 6ed9eba1 <repetition>
-        20 HEX: 8f1bbcdc <repetition>
-        20 HEX: ca62c1d6 <repetition> 
-        4 { } nappend-as
-    ]
-
-TUPLE: sha2-state < checksum-state K H word-size ;
-
-TUPLE: sha2-short < sha2-state ;
-
-TUPLE: sha2-long < sha2-state ;
-
-TUPLE: sha-224-state < sha2-short ;
-
-TUPLE: sha-256-state < sha2-short ;
-
-M: sha2-state clone
-    call-next-method
-    [ clone ] change-H
-    [ clone ] change-K ;
-
-<PRIVATE
-
-CONSTANT: a 0
-CONSTANT: b 1
-CONSTANT: c 2
-CONSTANT: d 3
-CONSTANT: e 4
-CONSTANT: f 5
-CONSTANT: g 6
-CONSTANT: h 7
-
-CONSTANT: initial-H-224
-    {
-        HEX: c1059ed8 HEX: 367cd507 HEX: 3070dd17 HEX: f70e5939
-        HEX: ffc00b31 HEX: 68581511 HEX: 64f98fa7 HEX: befa4fa4
-    }
-
-CONSTANT: initial-H-256
-    {
-        HEX: 6a09e667 HEX: bb67ae85 HEX: 3c6ef372 HEX: a54ff53a
-        HEX: 510e527f HEX: 9b05688c HEX: 1f83d9ab HEX: 5be0cd19
-    }
-
-CONSTANT: initial-H-384
-    {
-        HEX: cbbb9d5dc1059ed8
-        HEX: 629a292a367cd507
-        HEX: 9159015a3070dd17
-        HEX: 152fecd8f70e5939
-        HEX: 67332667ffc00b31
-        HEX: 8eb44a8768581511
-        HEX: db0c2e0d64f98fa7
-        HEX: 47b5481dbefa4fa4
-    }
-
-CONSTANT: initial-H-512
-    {
-        HEX: 6a09e667f3bcc908
-        HEX: bb67ae8584caa73b
-        HEX: 3c6ef372fe94f82b
-        HEX: a54ff53a5f1d36f1
-        HEX: 510e527fade682d1
-        HEX: 9b05688c2b3e6c1f
-        HEX: 1f83d9abfb41bd6b
-        HEX: 5be0cd19137e2179
-    }
-
-CONSTANT: K-256
-    {
-        HEX: 428a2f98 HEX: 71374491 HEX: b5c0fbcf HEX: e9b5dba5
-        HEX: 3956c25b HEX: 59f111f1 HEX: 923f82a4 HEX: ab1c5ed5
-        HEX: d807aa98 HEX: 12835b01 HEX: 243185be HEX: 550c7dc3
-        HEX: 72be5d74 HEX: 80deb1fe HEX: 9bdc06a7 HEX: c19bf174
-        HEX: e49b69c1 HEX: efbe4786 HEX: 0fc19dc6 HEX: 240ca1cc
-        HEX: 2de92c6f HEX: 4a7484aa HEX: 5cb0a9dc HEX: 76f988da
-        HEX: 983e5152 HEX: a831c66d HEX: b00327c8 HEX: bf597fc7
-        HEX: c6e00bf3 HEX: d5a79147 HEX: 06ca6351 HEX: 14292967
-        HEX: 27b70a85 HEX: 2e1b2138 HEX: 4d2c6dfc HEX: 53380d13
-        HEX: 650a7354 HEX: 766a0abb HEX: 81c2c92e HEX: 92722c85
-        HEX: a2bfe8a1 HEX: a81a664b HEX: c24b8b70 HEX: c76c51a3
-        HEX: d192e819 HEX: d6990624 HEX: f40e3585 HEX: 106aa070
-        HEX: 19a4c116 HEX: 1e376c08 HEX: 2748774c HEX: 34b0bcb5
-        HEX: 391c0cb3 HEX: 4ed8aa4a HEX: 5b9cca4f HEX: 682e6ff3
-        HEX: 748f82ee HEX: 78a5636f HEX: 84c87814 HEX: 8cc70208
-        HEX: 90befffa HEX: a4506ceb HEX: bef9a3f7 HEX: c67178f2
-    }
-
-CONSTANT: K-384
-    {
-
-        HEX: 428a2f98d728ae22 HEX: 7137449123ef65cd HEX: b5c0fbcfec4d3b2f HEX: e9b5dba58189dbbc 
-        HEX: 3956c25bf348b538 HEX: 59f111f1b605d019 HEX: 923f82a4af194f9b HEX: ab1c5ed5da6d8118 
-        HEX: d807aa98a3030242 HEX: 12835b0145706fbe HEX: 243185be4ee4b28c HEX: 550c7dc3d5ffb4e2
-        HEX: 72be5d74f27b896f HEX: 80deb1fe3b1696b1 HEX: 9bdc06a725c71235 HEX: c19bf174cf692694 
-        HEX: e49b69c19ef14ad2 HEX: efbe4786384f25e3 HEX: 0fc19dc68b8cd5b5 HEX: 240ca1cc77ac9c65 
-        HEX: 2de92c6f592b0275 HEX: 4a7484aa6ea6e483 HEX: 5cb0a9dcbd41fbd4 HEX: 76f988da831153b5 
-        HEX: 983e5152ee66dfab HEX: a831c66d2db43210 HEX: b00327c898fb213f HEX: bf597fc7beef0ee4 
-        HEX: c6e00bf33da88fc2 HEX: d5a79147930aa725 HEX: 06ca6351e003826f HEX: 142929670a0e6e70 
-        HEX: 27b70a8546d22ffc HEX: 2e1b21385c26c926 HEX: 4d2c6dfc5ac42aed HEX: 53380d139d95b3df 
-        HEX: 650a73548baf63de HEX: 766a0abb3c77b2a8 HEX: 81c2c92e47edaee6 HEX: 92722c851482353b 
-        HEX: a2bfe8a14cf10364 HEX: a81a664bbc423001 HEX: c24b8b70d0f89791 HEX: c76c51a30654be30 
-        HEX: d192e819d6ef5218 HEX: d69906245565a910 HEX: f40e35855771202a HEX: 106aa07032bbd1b8 
-        HEX: 19a4c116b8d2d0c8 HEX: 1e376c085141ab53 HEX: 2748774cdf8eeb99 HEX: 34b0bcb5e19b48a8 
-        HEX: 391c0cb3c5c95a63 HEX: 4ed8aa4ae3418acb HEX: 5b9cca4f7763e373 HEX: 682e6ff3d6b2b8a3 
-        HEX: 748f82ee5defb2fc HEX: 78a5636f43172f60 HEX: 84c87814a1f0ab72 HEX: 8cc702081a6439ec 
-        HEX: 90befffa23631e28 HEX: a4506cebde82bde9 HEX: bef9a3f7b2c67915 HEX: c67178f2e372532b 
-        HEX: ca273eceea26619c HEX: d186b8c721c0c207 HEX: eada7dd6cde0eb1e HEX: f57d4f7fee6ed178 
-        HEX: 06f067aa72176fba HEX: 0a637dc5a2c898a6 HEX: 113f9804bef90dae HEX: 1b710b35131c471b 
-        HEX: 28db77f523047d84 HEX: 32caab7b40c72493 HEX: 3c9ebe0a15c9bebc HEX: 431d67c49c100d4c 
-        HEX: 4cc5d4becb3e42b6 HEX: 597f299cfc657e2a HEX: 5fcb6fab3ad6faec HEX: 6c44198c4a475817
-    }
-
-ALIAS: K-512 K-384
-
-: <sha1-state> ( -- sha1-state )
-    sha1-state new-checksum-state
-        64 >>block-size
-        K-sha1 >>K
-        initial-H-sha1 >>H
-        4 >>word-size ;
-
-: <sha-224-state> ( -- sha2-state )
-    sha-224-state new-checksum-state
-        64 >>block-size
-        K-256 >>K
-        initial-H-224 >>H
-        4 >>word-size ;
-
-: <sha-256-state> ( -- sha2-state )
-    sha-256-state new-checksum-state
-        64 >>block-size
-        K-256 >>K
-        initial-H-256 >>H
-        4 >>word-size ;
-
-M: sha1 initialize-checksum-state drop <sha1-state> ;
-
-M: sha-224 initialize-checksum-state drop <sha-224-state> ;
-
-M: sha-256 initialize-checksum-state drop <sha-256-state> ;
-
-: s0-256 ( x -- x' )
-    [
-        [ -7 bitroll-32 ]
-        [ -18 bitroll-32 ]
-        [ -3 shift ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: s1-256 ( x -- x' )
-    [
-        [ -17 bitroll-32 ]
-        [ -19 bitroll-32 ]
-        [ -10 shift ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: S0-256 ( x -- x' )
-    [
-        [ -2 bitroll-32 ]
-        [ -13 bitroll-32 ]
-        [ -22 bitroll-32 ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: S1-256 ( x -- x' )
-    [
-        [ -6 bitroll-32 ]
-        [ -11 bitroll-32 ]
-        [ -25 bitroll-32 ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: s0-512 ( x -- x' )
-    [
-        [ -1 bitroll-64 ]
-        [ -8 bitroll-64 ]
-        [ -7 shift ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: s1-512 ( x -- x' )
-    [
-        [ -19 bitroll-64 ]
-        [ -61 bitroll-64 ]
-        [ -6 shift ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: S0-512 ( x -- x' )
-    [
-        [ -28 bitroll-64 ]
-        [ -34 bitroll-64 ]
-        [ -39 bitroll-64 ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: S1-512 ( x -- x' )
-    [
-        [ -14 bitroll-64 ]
-        [ -18 bitroll-64 ]
-        [ -41 bitroll-64 ] tri
-    ] [ bitxor ] reduce-outputs ; inline
-
-: prepare-M-256 ( n seq -- )
-    {
-        [ [ 16 - ] dip nth ]
-        [ [ 15 - ] dip nth s0-256 ]
-        [ [ 7 - ] dip nth ]
-        [ [ 2 - ] dip nth s1-256 w+ w+ w+ ]
-        [ ]
-    } 2cleave set-nth ; inline
-
-: prepare-M-512 ( n seq -- )
-    {
-        [ [ 16 - ] dip nth ]
-        [ [ 15 - ] dip nth s0-512 ]
-        [ [ 7 - ] dip nth ]
-        [ [ 2 - ] dip nth s1-512 w+ w+ w+ ]
-        [ ]
-    } 2cleave set-nth ; inline
-
-: ch ( x y z -- x' )
-    [ bitxor bitand ] keep bitxor ; inline
-
-: maj ( x y z -- x' )
-    [ [ bitand ] [ bitor ] 2bi ] dip bitand bitor ; inline
-
-: slice3 ( n seq -- a b c )
-    [ dup 3 + ] dip <slice> first3 ; inline
-
-GENERIC: pad-initial-bytes ( string sha2 -- padded-string )
-
-:: T1-256 ( n M H sha2 -- T1 )
-    n M nth
-    n sha2 K>> nth +
-    e H slice3 ch w+
-    e H nth S1-256 w+
-    h H nth w+ ; inline
-
-: T2-256 ( H -- T2 )
-    [ a swap nth S0-256 ]
-    [ a swap slice3 maj w+ ] bi ; inline
-
-:: T1-512 ( n M H sha2 -- T1 )
-    n M nth
-    n sha2 K>> nth +
-    e H slice3 ch w+
-    e H nth S1-512 w+
-    h H nth w+ ; inline
-
-: T2-512 ( H -- T2 )
-    [ a swap nth S0-512 ]
-    [ a swap slice3 maj w+ ] bi ; inline
-
-: update-H ( T1 T2 H -- )
-    h g pick exchange
-    g f pick exchange
-    f e pick exchange
-    pick d pick nth w+ e pick set-nth
-    d c pick exchange
-    c b pick exchange
-    b a pick exchange
-    [ w+ a ] dip set-nth ; inline
-
-: prepare-message-schedule ( seq sha2 -- w-seq )
-    [ word-size>> <sliced-groups> [ be> ] map ]
-    [
-        block-size>> [ 0 pad-tail 16 ] keep [a,b) over
-        '[ _ prepare-M-256 ] each
-    ] bi ; inline
-
-:: process-chunk ( M block-size cloned-H sha2 -- )
-    block-size [
-        M cloned-H sha2 T1-256
-        cloned-H T2-256
-        cloned-H update-H
-    ] each
-    sha2 [ cloned-H [ w+ ] 2map ] change-H drop ; inline
-
-M: sha2-short checksum-block
-    [ prepare-message-schedule ]
-    [ [ block-size>> ] [ H>> clone ] [ ] tri process-chunk ] bi ;
-
-: seq>byte-array ( seq n -- string )
-    '[ _ >be ] map B{ } join ;
-
-: sha1>checksum ( sha2 -- bytes )
-    H>> 4 seq>byte-array ;
-
-: sha-224>checksum ( sha2 -- bytes )
-    H>> 7 head 4 seq>byte-array ;
-
-: sha-256>checksum ( sha2 -- bytes )
-    H>> 4 seq>byte-array ;
-
-: pad-last-short-block ( state -- )
-    [ bytes>> t ] [ bytes-read>> pad-last-block ] [ ] tri
-    [ checksum-block ] curry each ;
-
-PRIVATE>
-
-M: sha-224-state get-checksum
-    clone
-    [ pad-last-short-block ] [ sha-224>checksum ] bi ;
-
-M: sha-256-state get-checksum
-    clone
-    [ pad-last-short-block ] [ sha-256>checksum ] bi ;
-
-M: sha-224 checksum-stream ( stream checksum -- byte-array )
-    drop
-    [ <sha-224-state> ] dip add-checksum-stream get-checksum ;
-
-M: sha-256 checksum-stream ( stream checksum -- byte-array )
-    drop
-    [ <sha-256-state> ] dip add-checksum-stream get-checksum ;
-
-
-
-: sha1-W ( t seq -- )
-    {
-        [ [ 3 - ] dip nth ]
-        [ [ 8 - ] dip nth bitxor ]
-        [ [ 14 - ] dip nth bitxor ]
-        [ [ 16 - ] dip nth bitxor 1 bitroll-32 ]
-        [ ]
-    } 2cleave set-nth ;
-
-: prepare-sha1-message-schedule ( seq -- w-seq )
-    4 <sliced-groups> [ be> ] map
-    80 0 pad-tail 16 80 [a,b) over
-    '[ _ sha1-W ] each ; inline
-
-: sha1-f ( B C D n -- f_nbcd )
-    20 /i
-    {
-        { 0 [ [ over bitnot ] dip bitand [ bitand ] dip bitor ] }
-        { 1 [ bitxor bitxor ] }
-        { 2 [ 2dup bitand [ pick bitand [ bitand ] dip ] dip bitor bitor ] }
-        { 3 [ bitxor bitxor ] }
-    } case ;
-
-:: inner-loop ( n H W K -- temp )
-    a H nth :> A
-    b H nth :> B
-    c H nth :> C
-    d H nth :> D
-    e H nth :> E
-    [
-        A 5 bitroll-32
-
-        B C D n sha1-f 
-
-        E
-
-        n K nth
-
-        n W nth
-    ] sum-outputs 32 bits ;
-
-:: process-sha1-chunk ( bytes H W K state -- )
-    80 [
-        H W K inner-loop
-        d H nth e H set-nth
-        c H nth d H set-nth
-        b H nth 30 bitroll-32 c H set-nth
-        a H nth b H set-nth
-        a H set-nth
-    ] each
-    state [ H [ w+ ] 2map ] change-H drop ; inline
-
-M:: sha1-state checksum-block ( bytes state -- )
-    bytes prepare-sha1-message-schedule state (>>W)
-
-    bytes
-    state [ H>> clone ] [ W>> ] [ K>> ] tri state process-sha1-chunk ;
-
-M: sha1-state get-checksum
-    clone
-    [ pad-last-short-block ] [ sha-256>checksum ] bi ;
-
-M: sha1 checksum-stream ( stream checksum -- byte-array )
-    drop
-    [ <sha1-state> ] dip add-checksum-stream get-checksum ;
diff --git a/basis/checksums/sha2/summary.txt b/basis/checksums/sha2/summary.txt
deleted file mode 100644 (file)
index 04365d4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SHA2 checksum algorithm
index 3f1bcb6085a1ccf6db8a844fa9dd23ab72e90049..efd6a52ef043bbab5312d4c0ff9ee5e6ecdeca84 100644 (file)
@@ -1,6 +1,6 @@
 USING: assocs classes help.markup help.syntax kernel
 quotations strings words words.symbol furnace.auth.providers.db
-checksums.sha2 furnace.auth.providers math byte-arrays
+checksums.sha furnace.auth.providers math byte-arrays
 http multiline ;
 IN: furnace.auth
 
index b9c961941c94b808395bb74f47c9fdd718805f0b..831ec7f8fc036e4ca11f00d191639f2e312869bc 100644 (file)
@@ -3,7 +3,7 @@
 USING: accessors assocs namespaces kernel sequences sets\r
 destructors combinators fry logging\r
 io.encodings.utf8 io.encodings.string io.binary random\r
-checksums checksums.sha2 urls\r
+checksums checksums.sha urls\r
 html.forms\r
 http.server\r
 http.server.filters\r
index 2fd6ffdaecb41d86008476796a01412f280ec2f4..4d284a1a40653ddeedbf61871bb57e50c654c7e1 100644 (file)
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-
-USING: byte-arrays checksums checksums.md5 checksums.sha1 
+USING: byte-arrays checksums checksums.md5 checksums.sha
 kernel math math.parser math.ranges random unicode.case 
 sequences strings system io.binary ;
 
index 6ef0e850253a8b7b830700afdf05821fc484ac0d..a05bf3a68534bce8940aa334bc8ff8c260e60170 100644 (file)
@@ -47,8 +47,7 @@ $nl
 "Checksum implementations:"
 { $subsection "checksums.crc32" }
 { $vocab-subsection "MD5 checksum" "checksums.md5" }
-{ $vocab-subsection "SHA1 checksum" "checksums.sha1" }
-{ $vocab-subsection "SHA2 checksum" "checksums.sha2" }
+{ $vocab-subsection "SHA checksums" "checksums.sha" }
 { $vocab-subsection "Adler-32 checksum" "checksums.adler-32" }
 { $vocab-subsection "OpenSSL checksums" "checksums.openssl" } ;
 
index c1a7af2966098d4ccf727e166a8a558b88564b74..481bc31eb26d1235fcf1e60350f3fa3e91dab36d 100644 (file)
@@ -1,4 +1,4 @@
-USING: checksums checksums.sha1 sequences byte-arrays kernel ;
+USING: checksums checksums.sha sequences byte-arrays kernel ;
 IN: benchmark.sha1
 
 : sha1-file ( -- )
index b319fa297bb1e6182aa6ab64116c234def995e5b..2d9cda146039e4a730b761546bc9cf803b626cd0 100644 (file)
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Maxim Savchenko
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: namespaces ecdsa tools.test checksums checksums.sha2 ;
+USING: namespaces ecdsa tools.test checksums checksums.sha ;
 IN: ecdsa.tests
 
 SYMBOLS: priv-key pub-key signature ;
@@ -27,4 +27,4 @@ SYMBOLS: priv-key pub-key signature ;
     message sha-256 checksum-bytes
     signature get pub-key get
     "prime256v1" [ set-public-key ecdsa-verify ] with-ec
-] unit-test
\ No newline at end of file
+] unit-test