Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zuse: add blake3 #6802

Merged
merged 9 commits into from
Apr 24, 2024
Merged

zuse: add blake3 #6802

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7a6fa2
zuse: add blake3
lukechampine Sep 22, 2023
7823964
zuse: cuter blake3 API
lukechampine Sep 29, 2023
96051ac
zuse: add blake3 jet hints
lukechampine Oct 8, 2023
8f57219
zuse: flip blake3 endianness
lukechampine Nov 19, 2023
ab06f5f
zuse: merge +xof:blake3 into +hash
lukechampine Nov 19, 2023
1f6b55b
zuse: reorder blake3 output fields to match spec
lukechampine Nov 21, 2023
7d01ee0
zuse: take octs in blake3
lukechampine Nov 22, 2023
f1154a7
zuse: fix blake3 jet registration
lukechampine Nov 22, 2023
9dd8eff
zuse: Simplify blake3 jet hints
lukechampine Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
143 changes: 143 additions & 0 deletions pkg/arvo/sys/zuse.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2357,6 +2357,149 @@
++ blake
~% %blake ..part ~
|%
++ blake3
=<
=< hash :: cuter API
=+ [cv=iv flags=0b0]
^? ~% %blake3 ..output ~
|%
::
++ keyed |=(key=octs hash(cv q.key, flags f-keyedhash))
::
++ hash
~% %hash ..hash ~
lukechampine marked this conversation as resolved.
Show resolved Hide resolved
|= [out=@ud msg=octs]
^- @ux
=/ root (root-output (turn (split-octs 13 msg) chunk-output))
%+ end [3 out]
%+ rep 9
%+ turn (gulf 0 (div out 64))
|=(i=@ (compress root(counter i)))
::
++ root-output
|= outputs=(list output)
^- output
%+ set-flag f-root
|-
=/ mid (div (bex (xeb (dec (lent outputs)))) 2)
=+ [l=(scag mid outputs) r=(slag mid outputs)]
?> ?=(^ outputs)
?~ t.outputs i.outputs
%- parent-output
[(compress $(outputs l)) (compress $(outputs r))]
::
++ parent-output
|= [l=@ux r=@ux]
^- output
%+ set-flag f-parent
[cv 0 (rep 8 ~[l r]) 64 flags]
::
++ chunk-output
~% %chunk-output ..chunk-output ~
|= [counter=@ chunk=octs]
^- output
%+ set-flag f-chunkend
%+ roll (split-octs 9 chunk)
|= [[i=@ block=octs] prev=output]
?: =(0 i) [cv counter q.block p.block (con flags f-chunkstart)]
[(output-cv prev) counter q.block p.block flags]
--
~% %blake3-impl ..blake3 ~
|%
lukechampine marked this conversation as resolved.
Show resolved Hide resolved
::
+$ output
$: cv=@ux
counter=@ud
block=@ux
blocklen=@ud
flags=@ub
==
::
++ compress
lukechampine marked this conversation as resolved.
Show resolved Hide resolved
~% %compress ..compress ~
|= output
^- @
|^
=/ state (can32 [8 cv] [4 iv] [2 counter] [1 blocklen] [1 flags] ~)
=. state (round state block) =. block (permute block)
=. state (round state block) =. block (permute block)
=. state (round state block) =. block (permute block)
=. state (round state block) =. block (permute block)
=. state (round state block) =. block (permute block)
=. state (round state block) =. block (permute block)
=. state (round state block) (mix state (rep 8 ~[(rsh 8 state) cv]))
::
++ round
|= [state=@ block=@]
^+ state
|^
=. state (g 0x0 0x4 0x8 0xc 0x0 0x1)
=. state (g 0x1 0x5 0x9 0xd 0x2 0x3)
=. state (g 0x2 0x6 0xa 0xe 0x4 0x5)
=. state (g 0x3 0x7 0xb 0xf 0x6 0x7)
=. state (g 0x0 0x5 0xa 0xf 0x8 0x9)
=. state (g 0x1 0x6 0xb 0xc 0xa 0xb)
=. state (g 0x2 0x7 0x8 0xd 0xc 0xd)
=. state (g 0x3 0x4 0x9 0xe 0xe 0xf)
state
::
++ g
|= [a=@ b=@ c=@ d=@ mx=@ my=@]
^+ state
=. state (set a :(sum32 (get a) (get b) (getb mx)))
=. state (set d (rox (get d) (get a) 16))
=. state (set c :(sum32 (get c) (get d)))
=. state (set b (rox (get b) (get c) 12))
=. state (set a :(sum32 (get a) (get b) (getb my)))
=. state (set d (rox (get d) (get a) 8))
=. state (set c :(sum32 (get c) (get d)))
=. state (set b (rox (get b) (get c) 7))
state
::
++ getb (curr get32 block)
++ get (curr get32 state)
++ set |=([i=@ w=@] (set32 i w state))
++ rox |=([a=@ b=@ n=@] (ror32 n (mix a b)))
--
::
++ permute
|= block=@
^+ block
(rep 5 (turn perm (curr get32 block)))
--
:: constants and helpers
::
++ iv 0x5be0.cd19.1f83.d9ab.9b05.688c.510e.527f.
a54f.f53a.3c6e.f372.bb67.ae85.6a09.e667
++ perm (rip 2 0x8fe9.5cb1.d407.a362)
++ f-chunkstart ^~ (bex 0)
++ f-chunkend ^~ (bex 1)
++ f-parent ^~ (bex 2)
++ f-root ^~ (bex 3)
++ f-keyedhash ^~ (bex 4)
++ f-derivekeyctx ^~ (bex 5)
++ f-derivekeymat ^~ (bex 6)
++ set-flag |=([f=@ o=output] o(flags (con flags.o f)))
++ fe32 ~(. fe 5)
++ ror32 (cury ror:fe32 0)
++ sum32 sum:fe32
++ can32 (cury can 5)
++ get32 |=([i=@ a=@] (cut 5 [i 1] a))
++ set32 |=([i=@ w=@ a=@] (sew 5 [i 1 w] a))
++ output-cv |=(o=output `@ux`(rep 8 ~[(compress o)]))
++ split-octs
|= [a=bloq msg=octs]
^- (list [i=@ octs])
lukechampine marked this conversation as resolved.
Show resolved Hide resolved
?> ?=(@ q.msg) :: simplfy jet logic
=/ per (bex (sub a 3))
=| chunk-octs=(list [i=@ octs])
=| i=@
|-
?: (lte p.msg per) [[i msg] chunk-octs]
:- [i per^(end a q.msg)]
$(i +(i), msg (sub p.msg per)^(rsh a q.msg))
--
::
::TODO generalize for both blake2 variants
++ blake2b
~/ %blake2b
Expand Down
77 changes: 76 additions & 1 deletion tests/sys/zuse/crypto/blake.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
:: tests for the blake2b hashing algorithm
:: tests for the blake2b and blake3 hashing algorithms
::
:: test vectors from here:
:: https://github.com/emilbayes/blake2b/blob/master/test-vectors.json
:: https://github.com/BLAKE3-team/BLAKE3/blob/master/test_vectors/test_vectors.json
::
/+ *test
=, blake:crypto
Expand Down Expand Up @@ -90,4 +91,78 @@
1070.faa0.372a.a43e.9248.4be1.c1e7.3ba1.0906.d5d1.853d.
b6a4.106e.0a7b.f980.0d37.3d6d.ee2d.46d6.2ef2.a461
==
::
++ do-blake3-test-vectors
|= ves=(list [out=@ msglen=@ud res=@ keyres=@])
^- tang
?~ ves ~
=- (weld - $(ves t.ves))
=, i.ves
=/ msg (blake3-test-msg msglen)
=/ keyed (keyed:blake3 32^'whats the Elvish word for friend')
;: weld
%+ expect-eq
!> `@ux`res
!> `@ux`(blake3 out msg)
%+ expect-eq
!> `@ux`keyres
!> `@ux`(keyed out msg)
==
::
++ blake3-test-msg
|= len=@
=/ iota ?:(=(0 len) ~ (gulf 0 (dec len)))
len^(rep 3 (turn iota (curr mod 251)))
::
++ test-blake3
::
%- do-blake3-test-vectors
:~
:^ 32
0
0x6232.1fe4.ca93.9acc.b712.c1ad.c925.cb9b.
49c9.dc36.ea4d.40a0.a6a1.f9f5.b949.13af
0x260d.d64e.8a49.f183.e773.95f0.a30e.ad27.
928a.2c39.626f.9d1f.763c.ed04.56b7.b292
::
:^ 128
0
0x2154.1663.531c.a399.3676.4e31.8282.07f1.
fdde.f296.ca77.f231.2640.9b15.2ec2.0170.
dadb.fff9.76f4.91cf.5904.a824.3039.e792.
2bc5.e0f9.9ec9.e6af.60f6.e889.7748.f526.
3a24.086c.208b.a99c.86cc.b885.e0df.8d33.
5030.33cd.9ff0.aa7f.6bf2.9ab6.e703.0fe0.
6232.1fe4.ca93.9acc.b712.c1ad.c925.cb9b.
49c9.dc36.ea4d.40a0.a6a1.f9f5.b949.13af
0xe871.c354.4269.1092.2a69.aac4.2a3b.ca60.
e50d.1953.262c.e2bb.eae1.6b85.6089.e58b.
75a9.4411.d4c1.18dc.c793.425e.e445.df72.
43f5.88f7.7e8c.9459.5e7d.797b.f9cb.733b.
7d62.8733.e1ec.205c.94d2.e4ba.c418.49a2.
db53.7110.1f70.2c82.944b.2af2.a271.81b1.
260d.d64e.8a49.f183.e773.95f0.a30e.ad27.
928a.2c39.626f.9d1f.763c.ed04.56b7.b292
::
:^ 32
1
0x13e2.92f5.d025.0251.c1b5.274d.a787.cd6d.
7336.a0af.356e.884c.f161.1bf1.dfde.3a2d
0x5bc9.808a.2238.abc1.4bd3.a2a3.c0b8.5414.
4fe1.8a27.1390.d335.5648.2fff.df78.786d
::
:^ 32
1.024
0xf75a.851c.125d.9b18.55aa.0dc1.31f8.0dc0.
4a74.89b8.de83.fcf3.06a4.95f0.3947.2142
0xa47b.9c71.317c.6803.5067.1e6f.5405.216c.
2e73.db80.e4ae.ca5e.f5b4.9e3d.6f6f.c475
::
:^ 32
31.744
0x475c.8994.cedc.6c4c.fbc4.abe7.328f.b7b4.
b635.628d.1a61.1aeb.c1bc.441a.0e96.b662
0x19a4.3999.bf4c.e62e.3042.9dac.e499.ab53.
730f.8d89.4d62.ba3d.597c.b69a.383b.a5ef
==
--